Reorder coloring inside diff editor

Display properly separators in differences

Change-Id: Ia7aa1f1ee96a07e0ed96773e8363e68f3d3a5638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

1 files changed, 13 insertions, 21 deletions

diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 8c593170f3..6da541b0ec 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -1120,27 +1120,19 @@ void SideBySideDiffEditorWidget::colorDiff(const QList<FileData> &fileDataList)
     QTextCursor leftCursor = m_leftEditor->textCursor();
     QTextCursor rightCursor = m_rightEditor->textCursor();
 
-    QList<QTextEdit::ExtraSelection> leftSelections
-            = colorPositions(m_leftLineFormat, leftCursor, leftLinePos);
-    leftSelections
-            += colorPositions(m_chunkLineFormat, leftCursor, leftChunkPos);
-    leftSelections
-            += colorPositions(m_fileLineFormat, leftCursor, leftFilePos);
-    leftSelections
-            += colorPositions(spanLineFormat, leftCursor, leftSkippedPos);
-    leftSelections
-            += colorPositions(m_leftCharFormat, leftCursor, leftCharPos);
-
-    QList<QTextEdit::ExtraSelection> rightSelections
-            = colorPositions(m_rightLineFormat, rightCursor, rightLinePos);
-    rightSelections
-            += colorPositions(m_chunkLineFormat, rightCursor, rightChunkPos);
-    rightSelections
-            += colorPositions(m_fileLineFormat, rightCursor, rightFilePos);
-    rightSelections
-            += colorPositions(spanLineFormat, rightCursor, rightSkippedPos);
-    rightSelections
-            += colorPositions(m_rightCharFormat, rightCursor, rightCharPos);
+    QList<QTextEdit::ExtraSelection> leftSelections;
+    leftSelections += colorPositions(m_leftLineFormat, leftCursor, leftLinePos);
+    leftSelections += colorPositions(m_leftCharFormat, leftCursor, leftCharPos);
+    leftSelections += colorPositions(spanLineFormat, leftCursor, leftSkippedPos);
+    leftSelections += colorPositions(m_chunkLineFormat, leftCursor, leftChunkPos);
+    leftSelections += colorPositions(m_fileLineFormat, leftCursor, leftFilePos);
+
+    QList<QTextEdit::ExtraSelection> rightSelections;
+    rightSelections += colorPositions(m_rightLineFormat, rightCursor, rightLinePos);
+    rightSelections += colorPositions(m_rightCharFormat, rightCursor, rightCharPos);
+    rightSelections += colorPositions(spanLineFormat, rightCursor, rightSkippedPos);
+    rightSelections += colorPositions(m_chunkLineFormat, rightCursor, rightChunkPos);
+    rightSelections += colorPositions(m_fileLineFormat, rightCursor, rightFilePos);
 
     m_leftEditor->setExtraSelections(BaseTextEditorWidget::OtherSelection, leftSelections);
     m_rightEditor->setExtraSelections(BaseTextEditorWidget::OtherSelection, rightSelections);