feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UnifiedDiffEditor: Early return inside jumpToOriginalFile()

Browse Source 
Change-Id: Ib397c316296db494b81a08214049884c45a3f5e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-30 08:57:11 +02:00
parent 191815e974
commit 38316079f3
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -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;
}
}
}
} else {
m_controller.jumpToOriginalFile(leftFileName, leftLineNumber, columnNumber);
}
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;
}
}
}
}