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

DiffEditor: Use DiffSide in DiffEditorInput

Browse Source 
Change-Id: I195c37f29884f1d066acbb54c8ace07f8801f829
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-28 00:06:02 +02:00
parent 6ec7ce539b
commit 472d791fec
4 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -338,11 +338,11 @@ SideBySideDiffOutput SideDiffData::diffOutput(QFutureInterface<void> &fi, int pr
if (!rowData.equal) {
if (rowData.line[LeftSide].textLineType == TextLineData::TextLine)
leftFormats[blockNumber].append({input.m_leftLineFormat});
leftFormats[blockNumber].append({input.m_lineFormat[LeftSide]});
else
leftFormats[blockNumber].append({input.m_spanLineFormat});
if (rowData.line[RightSide].textLineType == TextLineData::TextLine)
rightFormats[blockNumber].append({input.m_rightLineFormat});
rightFormats[blockNumber].append({input.m_lineFormat[RightSide]});
else
rightFormats[blockNumber].append({input.m_spanLineFormat});
}
@@ -350,13 +350,13 @@ SideBySideDiffOutput SideDiffData::diffOutput(QFutureInterface<void> &fi, int pr
for (auto it = leftLineData.changedPositions.cbegin(),
end = leftLineData.changedPositions.cend(); it != end; ++it) {
leftFormats[blockNumber].append(
{input.m_leftCharFormat, it.key(), it.value()});
{input.m_charFormat[LeftSide], it.key(), it.value()});
}
for (auto it = rightLineData.changedPositions.cbegin(),
end = rightLineData.changedPositions.cend(); it != end; ++it) {
rightFormats[blockNumber].append(
{input.m_rightCharFormat, it.key(), it.value()});
{input.m_charFormat[RightSide], it.key(), it.value()});
}
leftText += separator;