diffeditorplugin.cpp 32.3 KB
Newer Older
1 2
/****************************************************************************
**
3
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia.  For licensing terms and
** conditions see http://qt.digia.com/licensing.  For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights.  These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/

#include "diffeditorplugin.h"
31
#include "diffeditor.h"
32
#include "diffeditorconstants.h"
jkobus's avatar
jkobus committed
33
#include "diffeditordocument.h"
34
#include "diffeditorfactory.h"
jkobus's avatar
jkobus committed
35
#include "diffeditormanager.h"
jkobus's avatar
jkobus committed
36 37
#include "diffeditorreloader.h"
#include "differ.h"
38 39 40

#include <QFileDialog>
#include <QTextCodec>
41
#include <QtPlugin>
42 43 44 45 46

#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
47
#include <coreplugin/icore.h>
48

49
namespace DiffEditor {
50 51
namespace Internal {

jkobus's avatar
jkobus committed
52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
class SimpleDiffEditorReloader : public DiffEditorReloader
{
    Q_OBJECT
public:
    SimpleDiffEditorReloader(QObject *parent,
                             const QString &leftFileName,
                             const QString &rightFileName);

protected:
    void reload();

private:
    QString m_leftFileName;
    QString m_rightFileName;
};

SimpleDiffEditorReloader::SimpleDiffEditorReloader(QObject *parent,
                                                   const QString &leftFileName,
                                                   const QString &rightFileName)
    : DiffEditorReloader(parent),
      m_leftFileName(leftFileName),
      m_rightFileName(rightFileName)
{
}

void SimpleDiffEditorReloader::reload()
{
79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
    QString errorString;
    Utils::TextFileFormat format;
    format.codec = Core::EditorManager::defaultTextCodec();

    QString leftText;
    if (Utils::TextFileFormat::readFile(m_leftFileName,
                                    format.codec,
                                    &leftText, &format, &errorString)
            != Utils::TextFileFormat::ReadSuccess) {

        return;
    }

    QString rightText;
    if (Utils::TextFileFormat::readFile(m_rightFileName,
                                    format.codec,
                                    &rightText, &format, &errorString)
            != Utils::TextFileFormat::ReadSuccess) {

        return;
    }
jkobus's avatar
jkobus committed
100 101 102 103 104 105 106 107 108 109 110

    Differ differ;
    QList<Diff> diffList = differ.cleanupSemantics(
                differ.diff(leftText, rightText));

    QList<Diff> leftDiffList;
    QList<Diff> rightDiffList;
    Differ::splitDiffList(diffList, &leftDiffList, &rightDiffList);
    QList<Diff> outputLeftDiffList;
    QList<Diff> outputRightDiffList;

111
    if (controller()->isIgnoreWhitespace()) {
jkobus's avatar
jkobus committed
112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
        const QList<Diff> leftIntermediate =
                Differ::moveWhitespaceIntoEqualities(leftDiffList);
        const QList<Diff> rightIntermediate =
                Differ::moveWhitespaceIntoEqualities(rightDiffList);
        Differ::ignoreWhitespaceBetweenEqualities(leftIntermediate,
                                                  rightIntermediate,
                                                  &outputLeftDiffList,
                                                  &outputRightDiffList);
    } else {
        outputLeftDiffList = leftDiffList;
        outputRightDiffList = rightDiffList;
    }

    const ChunkData chunkData = DiffUtils::calculateOriginalData(
                outputLeftDiffList, outputRightDiffList);
    FileData fileData = DiffUtils::calculateContextData(
128
                chunkData, controller()->contextLinesNumber(), 0);
jkobus's avatar
jkobus committed
129 130 131 132 133 134
    fileData.leftFileInfo.fileName = m_leftFileName;
    fileData.rightFileInfo.fileName = m_rightFileName;

    QList<FileData> fileDataList;
    fileDataList << fileData;

135
    controller()->setDiffFiles(fileDataList);
jkobus's avatar
jkobus committed
136 137 138 139 140 141

    reloadFinished();
}

/////////////////

142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157
DiffEditorPlugin::DiffEditorPlugin()
{
}

DiffEditorPlugin::~DiffEditorPlugin()
{
}

bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
    Q_UNUSED(arguments)
    Q_UNUSED(errorMessage)

    //register actions
    Core::ActionContainer *toolsContainer =
        Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
jkobus's avatar
jkobus committed
158 159
    toolsContainer->insertGroup(Core::Constants::G_TOOLS_OPTIONS,
                                Constants::G_TOOLS_DIFF);
160 161 162 163 164 165 166 167 168 169 170

    Core::Context globalcontext(Core::Constants::C_GLOBAL);

    QAction *diffAction = new QAction(tr("Diff..."), this);
    Core::Command *diffCommand = Core::ActionManager::registerAction(diffAction,
                             "DiffEditor.Diff", globalcontext);
    connect(diffAction, SIGNAL(triggered()), this, SLOT(diff()));
    toolsContainer->addAction(diffCommand, Constants::G_TOOLS_DIFF);

    addAutoReleasedObject(new DiffEditorFactory(this));

jkobus's avatar
jkobus committed
171 172
    new DiffEditorManager(this);

173 174 175 176 177 178 179 180 181
    return true;
}

void DiffEditorPlugin::extensionsInitialized()
{
}

void DiffEditorPlugin::diff()
{
182
    QString fileName1 = QFileDialog::getOpenFileName(Core::ICore::dialogParent(),
183
                                                     tr("Select First File for Diff"),
184 185 186 187
                                                     QString());
    if (fileName1.isNull())
        return;

188
    QString fileName2 = QFileDialog::getOpenFileName(Core::ICore::dialogParent(),
189
                                                     tr("Select Second File for Diff"),
190 191 192 193 194
                                                     QString());
    if (fileName2.isNull())
        return;


jkobus's avatar
jkobus committed
195 196 197
    const QString documentId = QLatin1String("Diff ") + fileName1
            + QLatin1String(", ") + fileName2;
    DiffEditorDocument *document = DiffEditorManager::find(documentId);
198 199 200 201
    QString title = tr("Diff \"%1\", \"%2\"").arg(fileName1).arg(fileName2);
    document = DiffEditorManager::findOrCreate(documentId, title);
    if (!document)
        return;
jkobus's avatar
jkobus committed
202

203 204
    DiffEditorController *controller = document->controller();
    if (!controller->reloader()) {
jkobus's avatar
jkobus committed
205 206
        SimpleDiffEditorReloader *reloader =
                new SimpleDiffEditorReloader(controller, fileName1, fileName2);
207
        controller->setReloader(reloader);
jkobus's avatar
jkobus committed
208
    }
jkobus's avatar
jkobus committed
209

jkobus's avatar
jkobus committed
210
    Core::EditorManager::activateEditorForDocument(document);
jkobus's avatar
jkobus committed
211

jkobus's avatar
jkobus committed
212
    document->controller()->requestReload();
213 214
}

jkobus's avatar
jkobus committed
215 216 217 218 219 220 221 222 223 224 225 226 227
} // namespace Internal
} // namespace DiffEditor

#ifdef WITH_TESTS

#include <QTest>

#include "diffutils.h"

Q_DECLARE_METATYPE(DiffEditor::ChunkData)
Q_DECLARE_METATYPE(QList<DiffEditor::FileData>)

void DiffEditor::Internal::DiffEditorPlugin::testMakePatch_data()
228
{
jkobus's avatar
jkobus committed
229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247
    QTest::addColumn<ChunkData>("sourceChunk");
    QTest::addColumn<QString>("leftFileName");
    QTest::addColumn<QString>("rightFileName");
    QTest::addColumn<bool>("lastChunk");
    QTest::addColumn<QString>("patchText");

    const QString fileName = QLatin1String("a.txt");
    const QString header = QLatin1String("--- ") + fileName
            + QLatin1String("\n+++ ") + fileName + QLatin1String("\n");

    QList<RowData> rows;
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(TextLineData::Separator));
    rows << RowData(TextLineData(QLatin1String("EFGH")));
    ChunkData chunk;
    chunk.rows = rows;
    QString patchText = header + QLatin1String("@@ -1,2 +1,1 @@\n"
                                               "-ABCD\n"
                                               " EFGH\n");
jkobus's avatar
jkobus committed
248 249 250 251 252 253 254 255 256 257 258 259 260 261 262
    QTest::newRow("Simple not a last chunk") << chunk
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    // chunk the same here
    patchText = header + QLatin1String("@@ -1,2 +1,1 @@\n"
                                       "-ABCD\n"
                                       " EFGH\n"
                                       "\\ No newline at end of file\n");

    QTest::newRow("Simple last chunk") << chunk
jkobus's avatar
jkobus committed
263 264 265 266 267 268 269 270
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

    rows.clear();
jkobus's avatar
jkobus committed
271
    rows << RowData(TextLineData(QLatin1String("ABCD")));
jkobus's avatar
jkobus committed
272 273 274 275 276 277 278 279
    rows << RowData(TextLineData(QLatin1String("")),
                    TextLineData(TextLineData::Separator));
    chunk.rows = rows;
    patchText = header + QLatin1String("@@ -1,1 +1,1 @@\n"
                                       "-ABCD\n"
                                       "+ABCD\n"
                                       "\\ No newline at end of file\n");

jkobus's avatar
jkobus committed
280
    QTest::newRow("EOL in last line removed") << chunk
jkobus's avatar
jkobus committed
281 282 283 284 285 286 287 288 289
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

    // chunk the same here
    patchText = header + QLatin1String("@@ -1,2 +1,1 @@\n"
jkobus's avatar
jkobus committed
290 291
                                       " ABCD\n"
                                       "-\n");
jkobus's avatar
jkobus committed
292

jkobus's avatar
jkobus committed
293
    QTest::newRow("Last empty line removed") << chunk
jkobus's avatar
jkobus committed
294 295 296 297 298 299 300 301
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    rows.clear();
jkobus's avatar
jkobus committed
302
    rows << RowData(TextLineData(QLatin1String("ABCD")));
jkobus's avatar
jkobus committed
303 304 305 306 307 308 309 310
    rows << RowData(TextLineData(TextLineData::Separator),
                    TextLineData(QLatin1String("")));
    chunk.rows = rows;
    patchText = header + QLatin1String("@@ -1,1 +1,1 @@\n"
                                       "-ABCD\n"
                                       "\\ No newline at end of file\n"
                                       "+ABCD\n");

jkobus's avatar
jkobus committed
311
    QTest::newRow("EOL to last line added") << chunk
jkobus's avatar
jkobus committed
312 313 314 315 316 317 318 319 320
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

    // chunk the same here
    patchText = header + QLatin1String("@@ -1,1 +1,2 @@\n"
jkobus's avatar
jkobus committed
321
                                       " ABCD\n"
jkobus's avatar
jkobus committed
322 323
                                       "+\n");

jkobus's avatar
jkobus committed
324
    QTest::newRow("Last empty line added") << chunk
jkobus's avatar
jkobus committed
325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("EFGH")));
    chunk.rows = rows;
    patchText = header + QLatin1String("@@ -1,1 +1,1 @@\n"
                                       "-ABCD\n"
                                       "+EFGH\n");

    QTest::newRow("Last line with a newline modified") << chunk
                            << fileName
                            << fileName
jkobus's avatar
jkobus committed
343
                            << false
jkobus's avatar
jkobus committed
344 345 346 347
                            << patchText;

    ///////////

jkobus's avatar
jkobus committed
348 349 350 351 352
    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("EFGH")));
    rows << RowData(TextLineData(QLatin1String("")));
    chunk.rows = rows;
jkobus's avatar
jkobus committed
353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426
    patchText = header + QLatin1String("@@ -1,2 +1,2 @@\n"
                                       "-ABCD\n"
                                       "+EFGH\n"
                                       " \n");
    QTest::newRow("Not a last line with a newline modified") << chunk
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("EFGH")));
    chunk.rows = rows;
    patchText = header + QLatin1String("@@ -1,1 +1,1 @@\n"
                                       "-ABCD\n"
                                       "\\ No newline at end of file\n"
                                       "+EFGH\n"
                                       "\\ No newline at end of file\n");

    QTest::newRow("Last line without a newline modified") << chunk
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

    // chunk the same here
    patchText = header + QLatin1String("@@ -1,1 +1,1 @@\n"
                                       "-ABCD\n"
                                       "+EFGH\n");
    QTest::newRow("Not a last line without a newline modified") << chunk
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("EFGH")));
    rows << RowData(TextLineData(QLatin1String("IJKL")));
    chunk.rows = rows;
    patchText = header + QLatin1String("@@ -1,2 +1,2 @@\n"
                                       "-ABCD\n"
                                       "+EFGH\n"
                                       " IJKL\n"
                                       "\\ No newline at end of file\n");

    QTest::newRow("Last but one line modified, last line without a newline")
            << chunk
            << fileName
            << fileName
            << true
            << patchText;

    ///////////

    // chunk the same here
    patchText = header + QLatin1String("@@ -1,2 +1,2 @@\n"
                                       "-ABCD\n"
                                       "+EFGH\n"
                                       " IJKL\n");

    QTest::newRow("Last but one line modified, last line with a newline")
            << chunk
            << fileName
            << fileName
            << false
            << patchText;
427 428
}

jkobus's avatar
jkobus committed
429 430 431 432 433 434 435 436 437 438
void DiffEditor::Internal::DiffEditorPlugin::testMakePatch()
{
    QFETCH(ChunkData, sourceChunk);
    QFETCH(QString, leftFileName);
    QFETCH(QString, rightFileName);
    QFETCH(bool, lastChunk);
    QFETCH(QString, patchText);

    QString result = DiffUtils::makePatch(sourceChunk, leftFileName, rightFileName, lastChunk);

jkobus's avatar
jkobus committed
439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467
    QCOMPARE(result, patchText);

    bool ok;
    QList<FileData> resultList = DiffUtils::readPatch(result, false, &ok);

    QVERIFY(ok);
    QCOMPARE(resultList.count(), 1);
    for (int i = 0; i < resultList.count(); i++) {
        const FileData &resultFileData = resultList.at(i);
        QCOMPARE(resultFileData.leftFileInfo.fileName, leftFileName);
        QCOMPARE(resultFileData.rightFileInfo.fileName, rightFileName);
        QCOMPARE(resultFileData.chunks.count(), 1);
        for (int j = 0; j < resultFileData.chunks.count(); j++) {
            const ChunkData &resultChunkData = resultFileData.chunks.at(j);
            QCOMPARE(resultChunkData.leftStartingLineNumber, sourceChunk.leftStartingLineNumber);
            QCOMPARE(resultChunkData.rightStartingLineNumber, sourceChunk.rightStartingLineNumber);
            QCOMPARE(resultChunkData.contextChunk, sourceChunk.contextChunk);
            QCOMPARE(resultChunkData.rows.count(), sourceChunk.rows.count());
            for (int k = 0; k < sourceChunk.rows.count(); k++) {
                const RowData &sourceRowData = sourceChunk.rows.at(k);
                const RowData &resultRowData = resultChunkData.rows.at(k);
                QCOMPARE(resultRowData.equal, sourceRowData.equal);
                QCOMPARE(resultRowData.leftLine.text, sourceRowData.leftLine.text);
                QCOMPARE(resultRowData.leftLine.textLineType, sourceRowData.leftLine.textLineType);
                QCOMPARE(resultRowData.rightLine.text, sourceRowData.rightLine.text);
                QCOMPARE(resultRowData.rightLine.textLineType, sourceRowData.rightLine.textLineType);
            }
        }
    }
jkobus's avatar
jkobus committed
468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504
}

void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data()
{
    QTest::addColumn<QString>("sourcePatch");
    QTest::addColumn<QList<FileData> >("fileDataList");

    QString patch = QLatin1String("diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp\n"
                                "index eab9e9b..082c135 100644\n"
                                "--- a/src/plugins/diffeditor/diffeditor.cpp\n"
                                "+++ b/src/plugins/diffeditor/diffeditor.cpp\n"
                                "@@ -187,9 +187,6 @@ void DiffEditor::ctor()\n"
                                "     m_controller = m_document->controller();\n"
                                "     m_guiController = new DiffEditorGuiController(m_controller, this);\n"
                                " \n"
                                "-//    m_sideBySideEditor->setDiffEditorGuiController(m_guiController);\n"
                                "-//    m_unifiedEditor->setDiffEditorGuiController(m_guiController);\n"
                                "-\n"
                                "     connect(m_controller, SIGNAL(cleared(QString)),\n"
                                "             this, SLOT(slotCleared(QString)));\n"
                                "     connect(m_controller, SIGNAL(diffContentsChanged(QList<DiffEditorController::DiffFilesContents>,QString)),\n"
                                "diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp\n"
                                "index 2f641c9..f8ff795 100644\n"
                                "--- a/src/plugins/diffeditor/diffutils.cpp\n"
                                "+++ b/src/plugins/diffeditor/diffutils.cpp\n"
                                "@@ -464,5 +464,12 @@ QString DiffUtils::makePatch(const ChunkData &chunkData,\n"
                                "     return diffText;\n"
                                " }\n"
                                " \n"
                                "+FileData DiffUtils::makeFileData(const QString &patch)\n"
                                "+{\n"
                                "+    FileData fileData;\n"
                                "+\n"
                                "+    return fileData;\n"
                                "+}\n"
                                "+\n"
                                " } // namespace Internal\n"
505 506 507 508 509 510 511 512 513 514 515 516 517 518 519
                                " } // namespace DiffEditor\n"
                                "diff --git a/new b/new\n"
                                "new file mode 100644\n"
                                "index 0000000..257cc56\n"
                                "--- /dev/null\n"
                                "+++ b/new\n"
                                "@@ -0,0 +1 @@\n"
                                "+foo\n"
                                "diff --git a/deleted b/deleted\n"
                                "deleted file mode 100644\n"
                                "index 257cc56..0000000\n"
                                "--- a/deleted\n"
                                "+++ /dev/null\n"
                                "@@ -1 +0,0 @@\n"
                                "-foo\n"
520 521 522 523 524 525
                                "diff --git a/empty b/empty\n"
                                "new file mode 100644\n"
                                "index 0000000..e69de29\n"
                                "diff --git a/empty b/empty\n"
                                "deleted file mode 100644\n"
                                "index e69de29..0000000\n"
526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542
                                "diff --git a/file a.txt b/file b.txt\n"
                                "similarity index 99%\n"
                                "copy from file a.txt\n"
                                "copy to file b.txt\n"
                                "index 1234567..9876543\n"
                                "--- a/file a.txt\n"
                                "+++ b/file b.txt\n"
                                "@@ -20,3 +20,3 @@\n"
                                " A\n"
                                "-B\n"
                                "+C\n"
                                " D\n"
                                "diff --git a/file a.txt b/file b.txt\n"
                                "similarity index 99%\n"
                                "rename from file a.txt\n"
                                "rename to file b.txt\n"
                                );
jkobus's avatar
jkobus committed
543 544 545 546 547 548 549

    FileData fileData1;
    fileData1.leftFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffeditor.cpp"),
                                          QLatin1String("eab9e9b"));
    fileData1.rightFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffeditor.cpp"),
                                           QLatin1String("082c135"));
    ChunkData chunkData1;
Orgad Shaneh's avatar
Orgad Shaneh committed
550 551
    chunkData1.leftStartingLineNumber = 186;
    chunkData1.rightStartingLineNumber = 186;
jkobus's avatar
jkobus committed
552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573
    QList<RowData> rows1;
    rows1.append(RowData(TextLineData(QLatin1String("    m_controller = m_document->controller();"))));
    rows1.append(RowData(TextLineData(QLatin1String("    m_guiController = new DiffEditorGuiController(m_controller, this);"))));
    rows1.append(RowData(TextLineData(QLatin1String(""))));
    rows1.append(RowData(TextLineData(QLatin1String("//    m_sideBySideEditor->setDiffEditorGuiController(m_guiController);")),
                         TextLineData(TextLineData::Separator)));
    rows1.append(RowData(TextLineData(QLatin1String("//    m_unifiedEditor->setDiffEditorGuiController(m_guiController);")),
                         TextLineData(TextLineData::Separator)));
    rows1.append(RowData(TextLineData(QLatin1String("")),
                         TextLineData(TextLineData::Separator)));
    rows1.append(RowData(TextLineData(QLatin1String("    connect(m_controller, SIGNAL(cleared(QString)),"))));
    rows1.append(RowData(TextLineData(QLatin1String("            this, SLOT(slotCleared(QString)));"))));
    rows1.append(RowData(TextLineData(QLatin1String("    connect(m_controller, SIGNAL(diffContentsChanged(QList<DiffEditorController::DiffFilesContents>,QString)),"))));
    chunkData1.rows = rows1;
    fileData1.chunks.append(chunkData1);

    FileData fileData2;
    fileData2.leftFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffutils.cpp"),
                                          QLatin1String("2f641c9"));
    fileData2.rightFileInfo = DiffFileInfo(QLatin1String("src/plugins/diffeditor/diffutils.cpp"),
                                           QLatin1String("f8ff795"));
    ChunkData chunkData2;
Orgad Shaneh's avatar
Orgad Shaneh committed
574 575
    chunkData2.leftStartingLineNumber = 463;
    chunkData2.rightStartingLineNumber = 463;
jkobus's avatar
jkobus committed
576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598
    QList<RowData> rows2;
    rows2.append(RowData(TextLineData(QLatin1String("    return diffText;"))));
    rows2.append(RowData(TextLineData(QLatin1String("}"))));
    rows2.append(RowData(TextLineData(QLatin1String(""))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String("FileData DiffUtils::makeFileData(const QString &patch)"))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String("{"))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String("    FileData fileData;"))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String(""))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String("    return fileData;"))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String("}"))));
    rows2.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String(""))));
    rows2.append(RowData(TextLineData(QLatin1String("} // namespace Internal"))));
    rows2.append(RowData(TextLineData(QLatin1String("} // namespace DiffEditor"))));
    chunkData2.rows = rows2;
    fileData2.chunks.append(chunkData2);

599 600 601
    FileData fileData3;
    fileData3.leftFileInfo = DiffFileInfo(QLatin1String("new"), QLatin1String("0000000"));
    fileData3.rightFileInfo = DiffFileInfo(QLatin1String("new"), QLatin1String("257cc56"));
602
    fileData3.fileOperation = FileData::NewFile;
603 604 605 606 607 608 609 610 611 612 613 614 615
    ChunkData chunkData3;
    chunkData3.leftStartingLineNumber = -1;
    chunkData3.rightStartingLineNumber = 0;
    QList<RowData> rows3;
    rows3.append(RowData(TextLineData::Separator, TextLineData(QLatin1String("foo"))));
    TextLineData textLineData3(TextLineData::TextLine);
    rows3.append(RowData(TextLineData::Separator, textLineData3));
    chunkData3.rows = rows3;
    fileData3.chunks.append(chunkData3);

    FileData fileData4;
    fileData4.leftFileInfo = DiffFileInfo(QLatin1String("deleted"), QLatin1String("257cc56"));
    fileData4.rightFileInfo = DiffFileInfo(QLatin1String("deleted"), QLatin1String("0000000"));
616
    fileData4.fileOperation = FileData::DeleteFile;
617 618 619 620 621 622 623 624 625 626
    ChunkData chunkData4;
    chunkData4.leftStartingLineNumber = 0;
    chunkData4.rightStartingLineNumber = -1;
    QList<RowData> rows4;
    rows4.append(RowData(TextLineData(QLatin1String("foo")), TextLineData::Separator));
    TextLineData textLineData4(TextLineData::TextLine);
    rows4.append(RowData(textLineData4, TextLineData::Separator));
    chunkData4.rows = rows4;
    fileData4.chunks.append(chunkData4);

627 628 629
    FileData fileData5;
    fileData5.leftFileInfo = DiffFileInfo(QLatin1String("empty"), QLatin1String("0000000"));
    fileData5.rightFileInfo = DiffFileInfo(QLatin1String("empty"), QLatin1String("e69de29"));
630
    fileData5.fileOperation = FileData::NewFile;
631 632 633 634

    FileData fileData6;
    fileData6.leftFileInfo = DiffFileInfo(QLatin1String("empty"), QLatin1String("e69de29"));
    fileData6.rightFileInfo = DiffFileInfo(QLatin1String("empty"), QLatin1String("0000000"));
635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655
    fileData6.fileOperation = FileData::DeleteFile;

    FileData fileData7;
    fileData7.leftFileInfo = DiffFileInfo(QLatin1String("file a.txt"), QLatin1String("1234567"));
    fileData7.rightFileInfo = DiffFileInfo(QLatin1String("file b.txt"), QLatin1String("9876543"));
    fileData7.fileOperation = FileData::CopyFile;
    ChunkData chunkData7;
    chunkData7.leftStartingLineNumber = 19;
    chunkData7.rightStartingLineNumber = 19;
    QList<RowData> rows7;
    rows7.append(RowData(TextLineData(QLatin1String("A"))));
    rows7.append(RowData(TextLineData(QLatin1String("B")),
                         TextLineData(QLatin1String("C"))));
    rows7.append(RowData(TextLineData(QLatin1String("D"))));
    chunkData7.rows = rows7;
    fileData7.chunks.append(chunkData7);

    FileData fileData8;
    fileData8.leftFileInfo = DiffFileInfo(QLatin1String("file a.txt"));
    fileData8.rightFileInfo = DiffFileInfo(QLatin1String("file b.txt"));
    fileData8.fileOperation = FileData::RenameFile;
656

jkobus's avatar
jkobus committed
657 658
    QList<FileData> fileDataList1;
    fileDataList1 << fileData1 << fileData2 << fileData3 << fileData4 << fileData5 << fileData6 << fileData7 << fileData8;
jkobus's avatar
jkobus committed
659 660

    QTest::newRow("Git patch") << patch
jkobus's avatar
jkobus committed
661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724
                               << fileDataList1;

    //////////////

    patch = QLatin1String("diff --git a/file foo.txt b/file foo.txt\n"
                          "index 1234567..9876543 100644\n"
                          "--- a/file foo.txt\n"
                          "+++ b/file foo.txt\n"
                          "@@ -50,4 +50,5 @@ void DiffEditor::ctor()\n"
                          " A\n"
                          " B\n"
                          " C\n"
                          "+\n");

    fileData1.leftFileInfo = DiffFileInfo(QLatin1String("file foo.txt"), QLatin1String("1234567"));
    fileData1.rightFileInfo = DiffFileInfo(QLatin1String("file foo.txt"), QLatin1String("9876543"));
    fileData1.fileOperation = FileData::ChangeFile;
    chunkData1.leftStartingLineNumber = 49;
    chunkData1.rightStartingLineNumber = 49;
    rows1.clear();
    rows1.append(RowData(TextLineData(QLatin1String("A"))));
    rows1.append(RowData(TextLineData(QLatin1String("B"))));
    rows1.append(RowData(TextLineData(QLatin1String("C"))));
    rows1.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String(""))));
    chunkData1.rows = rows1;
    fileData1.chunks.clear();
    fileData1.chunks.append(chunkData1);

    QList<FileData> fileDataList2;
    fileDataList2 << fileData1;

    QTest::newRow("Added line") << patch
                                << fileDataList2;

    //////////////

    patch = QLatin1String("diff --git a/file foo.txt b/file foo.txt\n"
                          "index 1234567..9876543 100644\n"
                          "--- a/file foo.txt\n"
                          "+++ b/file foo.txt\n"
                          "@@ -1,1 +1,1 @@\n"
                          "-ABCD\n"
                          "\\ No newline at end of file\n"
                          "+ABCD\n");

    fileData1.leftFileInfo = DiffFileInfo(QLatin1String("file foo.txt"), QLatin1String("1234567"));
    fileData1.rightFileInfo = DiffFileInfo(QLatin1String("file foo.txt"), QLatin1String("9876543"));
    fileData1.fileOperation = FileData::ChangeFile;
    chunkData1.leftStartingLineNumber = 0;
    chunkData1.rightStartingLineNumber = 0;
    rows1.clear();
    rows1.append(RowData(TextLineData(QLatin1String("ABCD"))));
    rows1.append(RowData(TextLineData(TextLineData::Separator),
                         TextLineData(QLatin1String(""))));
    chunkData1.rows = rows1;
    fileData1.chunks.clear();
    fileData1.chunks.append(chunkData1);

    QList<FileData> fileDataList3;
    fileDataList3 << fileData1;

    QTest::newRow("Last newline added to a line without newline") << patch
                                << fileDataList3;
jkobus's avatar
jkobus committed
725 726 727 728 729 730 731 732 733 734 735 736 737 738 739
}

void DiffEditor::Internal::DiffEditorPlugin::testReadPatch()
{
    QFETCH(QString, sourcePatch);
    QFETCH(QList<FileData>, fileDataList);

    bool ok;
    QList<FileData> result = DiffUtils::readPatch(sourcePatch, false, &ok);

    QVERIFY(ok);
    QCOMPARE(fileDataList.count(), result.count());
    for (int i = 0; i < fileDataList.count(); i++) {
        const FileData &origFileData = fileDataList.at(i);
        const FileData &resultFileData = result.at(i);
Orgad Shaneh's avatar
Orgad Shaneh committed
740 741 742 743 744
        QCOMPARE(resultFileData.leftFileInfo.fileName, origFileData.leftFileInfo.fileName);
        QCOMPARE(resultFileData.leftFileInfo.typeInfo, origFileData.leftFileInfo.typeInfo);
        QCOMPARE(resultFileData.rightFileInfo.fileName, origFileData.rightFileInfo.fileName);
        QCOMPARE(resultFileData.rightFileInfo.typeInfo, origFileData.rightFileInfo.typeInfo);
        QCOMPARE(resultFileData.chunks.count(), origFileData.chunks.count());
745
        QCOMPARE(resultFileData.fileOperation, origFileData.fileOperation);
jkobus's avatar
jkobus committed
746 747 748
        for (int j = 0; j < origFileData.chunks.count(); j++) {
            const ChunkData &origChunkData = origFileData.chunks.at(j);
            const ChunkData &resultChunkData = resultFileData.chunks.at(j);
Orgad Shaneh's avatar
Orgad Shaneh committed
749 750 751 752
            QCOMPARE(resultChunkData.leftStartingLineNumber, origChunkData.leftStartingLineNumber);
            QCOMPARE(resultChunkData.rightStartingLineNumber, origChunkData.rightStartingLineNumber);
            QCOMPARE(resultChunkData.contextChunk, origChunkData.contextChunk);
            QCOMPARE(resultChunkData.rows.count(), origChunkData.rows.count());
jkobus's avatar
jkobus committed
753 754 755
            for (int k = 0; k < origChunkData.rows.count(); k++) {
                const RowData &origRowData = origChunkData.rows.at(k);
                const RowData &resultRowData = resultChunkData.rows.at(k);
Orgad Shaneh's avatar
Orgad Shaneh committed
756 757 758 759 760
                QCOMPARE(resultRowData.equal, origRowData.equal);
                QCOMPARE(resultRowData.leftLine.text, origRowData.leftLine.text);
                QCOMPARE(resultRowData.leftLine.textLineType, origRowData.leftLine.textLineType);
                QCOMPARE(resultRowData.rightLine.text, origRowData.rightLine.text);
                QCOMPARE(resultRowData.rightLine.textLineType, origRowData.rightLine.textLineType);
jkobus's avatar
jkobus committed
761 762 763 764 765 766 767
            }
        }
    }
}

#endif // WITH_TESTS

768

769
Q_EXPORT_PLUGIN(DiffEditor::Internal::DiffEditorPlugin)
jkobus's avatar
jkobus committed
770 771

#include "diffeditorplugin.moc"