From 2a9c9f2d707d37e9cac8712aeac049c35fd820e7 Mon Sep 17 00:00:00 2001 From: jkobus Date: Fri, 24 Oct 2014 14:11:12 +0200 Subject: Hide some diff editor controls when diff editor is bound to a file. Remove unnecessary anymore "ignoreWhitespace" argument from functions which read a patch file. Transfer the ownership of reloader into controller. Task-number: QTCREATORBUG-13250 Change-Id: I68183005b845d6ece9ea2be9888abc8597310426 Reviewed-by: Tobias Hunger --- src/plugins/diffeditor/diffutils.cpp | 44 +++++++----------------------------- 1 file changed, 8 insertions(+), 36 deletions(-) (limited to 'src/plugins/diffeditor/diffutils.cpp') diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index 589c4ddb84..3f9c43a20d 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -517,7 +517,6 @@ QString DiffUtils::makePatch(const QList &fileDataList) } static QList readLines(const QString &patch, - bool ignoreWhitespace, bool lastChunk, bool *lastChunkAtTheEndOfFile, bool *ok) @@ -678,28 +677,16 @@ static QList readLines(const QString &patch, QList outputLeftDiffList; QList outputRightDiffList; - if (ignoreWhitespace) { - const QList leftIntermediate = - Differ::moveWhitespaceIntoEqualities(leftDiffList); - const QList rightIntermediate = - Differ::moveWhitespaceIntoEqualities(rightDiffList); - Differ::ignoreWhitespaceBetweenEqualities(leftIntermediate, - rightIntermediate, - &outputLeftDiffList, - &outputRightDiffList); - } else { - Differ::diffBetweenEqualities(leftDiffList, - rightDiffList, - &outputLeftDiffList, - &outputRightDiffList); - } + Differ::diffBetweenEqualities(leftDiffList, + rightDiffList, + &outputLeftDiffList, + &outputRightDiffList); return DiffUtils::calculateOriginalData(outputLeftDiffList, outputRightDiffList).rows; } static QList readChunks(const QString &patch, - bool ignoreWhitespace, bool *lastChunkAtTheEndOfFile, bool *ok) { @@ -728,7 +715,6 @@ static QList readChunks(const QString &patch, const QString lines = patch.mid(endOfLastChunk, pos - endOfLastChunk); chunkDataList.last().rows = readLines(lines, - ignoreWhitespace, false, lastChunkAtTheEndOfFile, &readOk); @@ -747,7 +733,6 @@ static QList readChunks(const QString &patch, if (endOfLastChunk > 0) { const QString lines = patch.mid(endOfLastChunk); chunkDataList.last().rows = readLines(lines, - ignoreWhitespace, true, lastChunkAtTheEndOfFile, &readOk); @@ -761,7 +746,6 @@ static QList readChunks(const QString &patch, } static FileData readDiffHeaderAndChunks(const QString &headerAndChunks, - bool ignoreWhitespace, bool *ok) { QString patch = headerAndChunks; @@ -789,7 +773,6 @@ static FileData readDiffHeaderAndChunks(const QString &headerAndChunks, fileData.rightFileInfo.fileName = rightFileRegExp.cap(1); fileData.chunks = readChunks(patch, - ignoreWhitespace, &fileData.lastChunkAtTheEndOfFile, &readOk); } @@ -811,7 +794,6 @@ static FileData readDiffHeaderAndChunks(const QString &headerAndChunks, } static QList readDiffPatch(const QString &patch, - bool ignoreWhitespace, bool *ok) { const QRegExp diffRegExp(QLatin1String("(?:\\n|^)" // new line of the beginning of a patch @@ -844,7 +826,6 @@ static QList readDiffPatch(const QString &patch, pos - lastPos); const FileData fileData = readDiffHeaderAndChunks(headerAndChunks, - ignoreWhitespace, &readOk); if (!readOk) @@ -861,7 +842,6 @@ static QList readDiffPatch(const QString &patch, patch.count() - lastPos - 1); const FileData fileData = readDiffHeaderAndChunks(headerAndChunks, - ignoreWhitespace, &readOk); if (readOk) @@ -880,7 +860,6 @@ static QList readDiffPatch(const QString &patch, static FileData readGitHeaderAndChunks(const QString &headerAndChunks, const QString &fileName, - bool ignoreWhitespace, bool *ok) { FileData fileData; @@ -944,7 +923,6 @@ static FileData readGitHeaderAndChunks(const QString &headerAndChunks, patch.remove(0, rightFileRegExp.matchedLength()); fileData.chunks = readChunks(patch, - ignoreWhitespace, &fileData.lastChunkAtTheEndOfFile, &readOk); } @@ -966,7 +944,6 @@ static FileData readCopyRenameChunks(const QString ©RenameChunks, FileData::FileOperation fileOperation, const QString &leftFileName, const QString &rightFileName, - bool ignoreWhitespace, bool *ok) { FileData fileData; @@ -1005,7 +982,6 @@ static FileData readCopyRenameChunks(const QString ©RenameChunks, patch.remove(0, rightFileRegExp.matchedLength()); fileData.chunks = readChunks(patch, - ignoreWhitespace, &fileData.lastChunkAtTheEndOfFile, &readOk); } @@ -1024,7 +1000,7 @@ static FileData readCopyRenameChunks(const QString ©RenameChunks, return fileData; } -static QList readGitPatch(const QString &patch, bool ignoreWhitespace, bool *ok) +static QList readGitPatch(const QString &patch, bool *ok) { const QRegExp simpleGitRegExp(QLatin1String("(?:\\n|^)diff --git a/([^\\n]+) b/\\1\\n")); // diff --git a/cap1 b/cap1 @@ -1074,14 +1050,12 @@ static QList readGitPatch(const QString &patch, bool ignoreWhitespace, if (lastOperation == FileData::ChangeFile) { fileData = readGitHeaderAndChunks(headerAndChunks, lastLeftFileName, - ignoreWhitespace, &readOk); } else { fileData = readCopyRenameChunks(headerAndChunks, lastOperation, lastLeftFileName, lastRightFileName, - ignoreWhitespace, &readOk); } if (!readOk) @@ -1124,14 +1098,12 @@ static QList readGitPatch(const QString &patch, bool ignoreWhitespace, fileData = readGitHeaderAndChunks(headerAndChunks, lastLeftFileName, - ignoreWhitespace, &readOk); } else { fileData = readCopyRenameChunks(headerAndChunks, lastOperation, lastLeftFileName, lastRightFileName, - ignoreWhitespace, &readOk); } if (readOk) @@ -1148,7 +1120,7 @@ static QList readGitPatch(const QString &patch, bool ignoreWhitespace, return fileDataList; } -QList DiffUtils::readPatch(const QString &patch, bool ignoreWhitespace, bool *ok) +QList DiffUtils::readPatch(const QString &patch, bool *ok) { bool readOk = false; @@ -1161,9 +1133,9 @@ QList DiffUtils::readPatch(const QString &patch, bool ignoreWhitespace if (pos != -1) croppedPatch = patch.left(pos + 1); // crop the ending for git format-patch - fileDataList = readGitPatch(croppedPatch, ignoreWhitespace, &readOk); + fileDataList = readGitPatch(croppedPatch, &readOk); if (!readOk) - fileDataList = readDiffPatch(croppedPatch, ignoreWhitespace, &readOk); + fileDataList = readDiffPatch(croppedPatch, &readOk); if (ok) *ok = readOk; -- cgit v1.2.1