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

Fix display of inserted lines by the end of file

Browse Source 
Task-number: QTCREATORBUG-11281

Change-Id: I2d84584a850cf159dd0724f79bbc967848b3047b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-01-15 09:50:23 +01:00
committed by Jarek Kobus
parent bdbf60876f
commit 3b2cb038cd
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/diffeditor/diffeditorwidget.cpp
View File

@@ -916,6 +916,9 @@ bool DiffEditorWidget::isWhitespace(const Diff &diff) const
bool DiffEditorWidget::isEqual(const QList<Diff> &diffList, int diffNumber) const bool DiffEditorWidget::isEqual(const QList<Diff> &diffList, int diffNumber) const
{ {
if (diffNumber == diffList.count())
return true;
const Diff &diff = diffList.at(diffNumber); const Diff &diff = diffList.at(diffNumber);
if (diff.command == Diff::Equal) if (diff.command == Diff::Equal)
return true; return true;
@@ -1035,8 +1038,10 @@ ChunkData DiffEditorWidget::calculateOriginalData(const QList<Diff> &diffList) c
bool lastLeftLineEqual = true; bool lastLeftLineEqual = true;
bool lastRightLineEqual = true; bool lastRightLineEqual = true;
for (int i = 0; i < diffList.count(); i++) { for (int i = 0; i <= diffList.count(); i++) {
Diff diff = diffList.at(i); Diff diff = i < diffList.count()
? diffList.at(i)
: Diff(Diff::Equal, QLatin1String("")); // dummy, ensure we process to the end even when diffList doesn't end with equality
const QStringList lines = diff.text.split(QLatin1Char('\n')); const QStringList lines = diff.text.split(QLatin1Char('\n'));
@@ -1052,14 +1057,14 @@ ChunkData DiffEditorWidget::calculateOriginalData(const QList<Diff> &diffList) c
for (int j = 0; j < lines.count(); j++) { for (int j = 0; j < lines.count(); j++) {
const QString line = lines.at(j); const QString line = lines.at(j);
if (j > 0) { if (j > 0 || i == diffList.count()) {
if (diff.command == Diff::Equal) { if (diff.command == Diff::Equal && lastLeftLineEqual && lastRightLineEqual) {
if (lastLeftLineEqual && lastRightLineEqual) { leftEqualLines.append(currentLeftLine);
leftEqualLines.append(currentLeftLine); rightEqualLines.append(currentRightLine);
rightEqualLines.append(currentRightLine);
}
} }
}
if (j > 0) {
if (diff.command != Diff::Insert) { if (diff.command != Diff::Insert) {
currentLeftLine++; currentLeftLine++;
currentLeftLineOffset++; currentLeftLineOffset++;
@@ -1083,7 +1088,7 @@ ChunkData DiffEditorWidget::calculateOriginalData(const QList<Diff> &diffList) c
rightLines.last() += line; rightLines.last() += line;
currentRightPos += line.count(); currentRightPos += line.count();
} else if (diff.command == Diff::Equal) { } else if (diff.command == Diff::Equal) {
if ((line.count() || (j && j < lines.count() - 1)) && // don't treat empty ending line as a line to be aligned unless a line is a one char '/n' only. if ((line.count() || (j && j < lines.count() - 1) || (i == diffList.count())) && // don't treat empty ending line as a line to be aligned unless a line is a one char '\n' only or it's the last line.
currentLeftLine != lastAlignedLeftLine && currentLeftLine != lastAlignedLeftLine &&
currentRightLine != lastAlignedRightLine) { currentRightLine != lastAlignedRightLine) {
// apply line spans before the current lines // apply line spans before the current lines