From 38316079f3f9505b7ee92689a63331030d42c731 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 30 Sep 2022 08:57:11 +0200 Subject: UnifiedDiffEditor: Early return inside jumpToOriginalFile() Change-Id: Ib397c316296db494b81a08214049884c45a3f5e5 Reviewed-by: Orgad Shaneh --- src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 38 ++++++++++------------ 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'src/plugins/diffeditor/unifieddiffeditorwidget.cpp') diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index cd2c6e7986..172688bf75 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -586,28 +586,26 @@ void UnifiedDiffEditorWidget::jumpToOriginalFile(const QTextCursor &cursor) } const int leftLineNumber = m_data.m_lineNumbers[LeftSide].value(blockNumber, qMakePair(-1, 0)).first; - if (leftLineNumber >= 0) { - if (leftFileName == rightFileName) { - for (const ChunkData &chunkData : fileData.chunks) { - - int newLeftLineNumber = chunkData.startingLineNumber[LeftSide]; - int newRightLineNumber = chunkData.startingLineNumber[RightSide]; - - for (const RowData &rowData : chunkData.rows) { - if (rowData.line[LeftSide].textLineType == TextLineData::TextLine) - newLeftLineNumber++; - if (rowData.line[RightSide].textLineType == TextLineData::TextLine) - newRightLineNumber++; - if (newLeftLineNumber == leftLineNumber) { - m_controller.jumpToOriginalFile(leftFileName, newRightLineNumber, 0); - return; - } - } + if (leftLineNumber < 0) + return; + if (leftFileName != rightFileName) { + m_controller.jumpToOriginalFile(leftFileName, leftLineNumber, columnNumber); + return; + } + + for (const ChunkData &chunkData : fileData.chunks) { + int newLeftLineNumber = chunkData.startingLineNumber[LeftSide]; + int newRightLineNumber = chunkData.startingLineNumber[RightSide]; + for (const RowData &rowData : chunkData.rows) { + if (rowData.line[LeftSide].textLineType == TextLineData::TextLine) + newLeftLineNumber++; + if (rowData.line[RightSide].textLineType == TextLineData::TextLine) + newRightLineNumber++; + if (newLeftLineNumber == leftLineNumber) { + m_controller.jumpToOriginalFile(leftFileName, newRightLineNumber, 0); + return; } - } else { - m_controller.jumpToOriginalFile(leftFileName, leftLineNumber, columnNumber); } - return; } } -- cgit v1.2.1