From 4c7f1c5ea98fead57034826d8fe7064c55ce992f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 28 Jul 2014 12:17:31 +0300 Subject: DiffEditor: Fix newline handling for not the last chunk Task-number: QTCREATORBUG-12665 Change-Id: I7a54fa5502d3e06c6e1ccd99dec800f80e217333 Reviewed-by: Orgad Shaneh --- src/plugins/diffeditor/diffeditorplugin.cpp | 1 - src/plugins/diffeditor/diffutils.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/diffeditor') diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 4b99681e88..6c6346998a 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -775,7 +775,6 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch() QCOMPARE(resultChunkData.leftStartingLineNumber, origChunkData.leftStartingLineNumber); QCOMPARE(resultChunkData.rightStartingLineNumber, origChunkData.rightStartingLineNumber); QCOMPARE(resultChunkData.contextChunk, origChunkData.contextChunk); - QEXPECT_FAIL("2 chunks - first ends with blank line", "QTCREATORBUG-12665", Abort); QCOMPARE(resultChunkData.rows.count(), origChunkData.rows.count()); for (int k = 0; k < origChunkData.rows.count(); k++) { const RowData &origRowData = origChunkData.rows.at(k); diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index f975462c47..af787f72ff 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -604,7 +604,7 @@ static QList readLines(const QString &patch, } else { if (noNewLineInEqual >= 0) { removeNewLineFromLastEqual = true; - } else if (lastChunk) { + } else { if (lastEqual > lastDelete && lastEqual > lastInsert) { removeNewLineFromLastEqual = true; } else if (lastDelete > lastEqual && lastDelete > lastInsert) { -- cgit v1.2.1