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

Refactor diff editor widget, fix whitespaces handling

Browse Source 
Prepare for ignoreNewLine handling

Task-number: QTCREATORBUG-11002

Change-Id: I97fc0887ef27c821252283ccbad655ac0bc79f0a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-01-17 15:59:31 +01:00
committed by Jarek Kobus
parent 66f8437b0e
commit a4b00160bb
3 changed files with 872 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/differ.cpp
View File

@@ -747,7 +747,7 @@ QList<Diff> Differ::cleanupSemantics(const QList<Diff> &diffList)
}
}
return cleanupOverlaps(cleanupSemanticsLossless(merge(newDiffList)));
return cleanupOverlaps(merge(cleanupSemanticsLossless(merge(newDiffList))));
}
QList<Diff> Differ::cleanupSemanticsLossless(const QList<Diff> &diffList)