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

DiffEditor: Use DiffSide enum inside ChunkData

Browse Source 
Change-Id: Ic10fe9faa6b6ccefcbf4c062663dedefa6bf5872
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-26 14:15:40 +02:00
parent b4390a3a80
commit cd8ff54b00
5 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,7 +362,7 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData
if (!line.isEmpty()) {
setLineNumber(LeftSide,
*blockNumber + blockCount + 1,
chunkData.leftStartingLineNumber + leftLineCount + 1,
chunkData.startingLineNumber[LeftSide] + leftLineCount + 1,
leftRowsBuffer.at(j));
blockCount += blockDelta;
++leftLineCount;
@@ -404,7 +404,7 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData
if (!line.isEmpty()) {
setLineNumber(RightSide,
*blockNumber + blockCount + 1,
chunkData.rightStartingLineNumber + rightLineCount + 1,
chunkData.startingLineNumber[RightSide] + rightLineCount + 1,
rightRowsBuffer.at(j));
blockCount += blockDelta;
++rightLineCount;
@@ -425,9 +425,9 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData
if (!line.isEmpty()) {
setLineNumber(LeftSide, *blockNumber + blockCount + 1,
chunkData.leftStartingLineNumber + leftLineCount + 1, i);
chunkData.startingLineNumber[LeftSide] + leftLineCount + 1, i);
setLineNumber(RightSide, *blockNumber + blockCount + 1,
chunkData.rightStartingLineNumber + rightLineCount + 1, i);
chunkData.startingLineNumber[RightSide] + rightLineCount + 1, i);
blockCount += line.count('\n');
++leftLineCount;
++rightLineCount;
@@ -450,11 +450,11 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData
}
const QString chunkLine = "@@ -"
+ QString::number(chunkData.leftStartingLineNumber + 1)
+ QString::number(chunkData.startingLineNumber[LeftSide] + 1)
+ ','
+ QString::number(leftLineCount)
+ " +"
+ QString::number(chunkData.rightStartingLineNumber+ 1)
+ QString::number(chunkData.startingLineNumber[RightSide]+ 1)
+ ','
+ QString::number(rightLineCount)
+ " @@"
@@ -688,8 +688,8 @@ void UnifiedDiffEditorWidget::jumpToOriginalFile(const QTextCursor &cursor)
if (leftFileName == rightFileName) {
for (const ChunkData &chunkData : fileData.chunks) {
int newLeftLineNumber = chunkData.leftStartingLineNumber;
int newRightLineNumber = chunkData.rightStartingLineNumber;
int newLeftLineNumber = chunkData.startingLineNumber[LeftSide];
int newRightLineNumber = chunkData.startingLineNumber[RightSide];
for (const RowData &rowData : chunkData.rows) {
if (rowData.leftLine.textLineType == TextLineData::TextLine)