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

10
src/plugins/diffeditor/diffutils.cpp
View File

@@ -288,8 +288,7 @@ FileData DiffUtils::calculateContextData(const ChunkData &originalData, int cont
const bool contextChunk = hiddenRows.contains(i);
ChunkData chunkData;
chunkData.contextChunk = contextChunk;
chunkData.leftStartingLineNumber = leftLineNumber;
chunkData.rightStartingLineNumber = rightLineNumber;
chunkData.startingLineNumber = {leftLineNumber, rightLineNumber};
while (i < originalData.rows.size()) {
if (contextChunk != hiddenRows.contains(i))
break;
@@ -430,11 +429,11 @@ QString DiffUtils::makePatch(const ChunkData &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)
+ " @@"
@@ -778,8 +777,7 @@ static bool detectChunkData(QStringView chunkDiff, ChunkData *chunkData, QString
if (!ok)
return false;
chunkData->leftStartingLineNumber = leftLineNumber - 1;
chunkData->rightStartingLineNumber = rightLineNumber - 1;
chunkData->startingLineNumber = {leftLineNumber - 1, rightLineNumber - 1};
chunkData->contextInfo = optionalHint.toString();
return true;