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

DiffEditor: Use DiffSide enum inside RowData

Browse Source 
Change-Id: I5511e443e2f76a1dab5cc78eec5faec04ee31bcc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-26 14:49:52 +02:00
parent cd8ff54b00
commit a1c4d563a1
6 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,8 @@ DiffEditorController *DiffEditorDocument::controller() const
static void appendRow(ChunkData *chunk, const RowData &row)
{
const bool isSeparator = row.leftLine.textLineType == TextLineData::Separator
&& row.rightLine.textLineType == TextLineData::Separator;
const bool isSeparator = row.line[LeftSide].textLineType == TextLineData::Separator
&& row.line[RightSide].textLineType == TextLineData::Separator;
if (!isSeparator)
chunk->rows.append(row);
}
@@ -83,30 +83,30 @@ ChunkData DiffEditorDocument::filterChunk(const ChunkData &data,
} else if (isLeftSelected) {
RowData newRow = row;
row.rightLine = TextLineData(TextLineData::Separator);
row.line[RightSide] = TextLineData(TextLineData::Separator);
appendRow(&chunk, row);
if (revert) {
newRow.leftLine = newRow.rightLine;
newRow.line[LeftSide] = newRow.line[RightSide];
newRow.equal = true;
appendRow(&chunk, newRow);
}
} else { // isRightSelected
if (!revert) {
RowData newRow = row;
newRow.rightLine = newRow.leftLine;
newRow.line[RightSide] = newRow.line[LeftSide];
newRow.equal = true;
appendRow(&chunk, newRow);
}
row.leftLine = TextLineData(TextLineData::Separator);
row.line[LeftSide] = TextLineData(TextLineData::Separator);
appendRow(&chunk, row);
}
} else {
if (revert)
row.leftLine = row.rightLine;
row.line[LeftSide] = row.line[RightSide];
else
row.rightLine = row.leftLine;
row.line[RightSide] = row.line[LeftSide];
row.equal = true;
appendRow(&chunk, row);
}