diffeditorplugin.cpp 22.8 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 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
class SimpleDiffEditorReloader : public DiffEditorReloader
{
    Q_OBJECT
public:
    SimpleDiffEditorReloader(QObject *parent,
                             const QString &leftFileName,
                             const QString &rightFileName);

protected:
    void reload();

private:
    QString getFileContents(const QString &fileName) const;

    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()
{
    const QString leftText = getFileContents(m_leftFileName);
    const QString rightText = getFileContents(m_rightFileName);

    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;

    if (diffEditorController()->isIgnoreWhitespace()) {
        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(
                chunkData, diffEditorController()->contextLinesNumber(), 0);
    fileData.leftFileInfo.fileName = m_leftFileName;
    fileData.rightFileInfo.fileName = m_rightFileName;

    QList<FileData> fileDataList;
    fileDataList << fileData;

    diffEditorController()->setDiffFiles(fileDataList);

    reloadFinished();
}

QString SimpleDiffEditorReloader::getFileContents(const QString &fileName) const
{
    QFile file(fileName);
    if (file.open(QIODevice::ReadOnly | QIODevice::Text))
        return Core::EditorManager::defaultTextCodec()->toUnicode(file.readAll());
    return QString();
}

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

133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
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
149 150
    toolsContainer->insertGroup(Core::Constants::G_TOOLS_OPTIONS,
                                Constants::G_TOOLS_DIFF);
151 152 153 154 155 156 157 158 159 160 161

    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
162 163
    new DiffEditorManager(this);

164 165 166 167 168 169 170 171 172
    return true;
}

void DiffEditorPlugin::extensionsInitialized()
{
}

void DiffEditorPlugin::diff()
{
173
    QString fileName1 = QFileDialog::getOpenFileName(Core::ICore::dialogParent(),
174
                                                     tr("Select First File for Diff"),
175 176 177 178
                                                     QString());
    if (fileName1.isNull())
        return;

179
    QString fileName2 = QFileDialog::getOpenFileName(Core::ICore::dialogParent(),
180
                                                     tr("Select Second File for Diff"),
181 182 183 184 185
                                                     QString());
    if (fileName2.isNull())
        return;


jkobus's avatar
jkobus committed
186 187 188 189 190 191 192 193
    const QString documentId = QLatin1String("Diff ") + fileName1
            + QLatin1String(", ") + fileName2;
    DiffEditorDocument *document = DiffEditorManager::find(documentId);
    if (!document) {
        QString title = tr("Diff \"%1\", \"%2\"").arg(fileName1).arg(fileName2);
        document = DiffEditorManager::findOrCreate(documentId, title);
        if (!document)
            return;
jkobus's avatar
jkobus committed
194

jkobus's avatar
jkobus committed
195 196 197 198 199
        DiffEditorController *controller = document->controller();
        SimpleDiffEditorReloader *reloader =
                new SimpleDiffEditorReloader(controller, fileName1, fileName2);
        reloader->setDiffEditorController(controller);
    }
jkobus's avatar
jkobus committed
200

jkobus's avatar
jkobus committed
201
    Core::EditorManager::activateEditorForDocument(document);
jkobus's avatar
jkobus committed
202

jkobus's avatar
jkobus committed
203
    document->controller()->requestReload();
204 205
}

jkobus's avatar
jkobus committed
206 207 208 209 210 211 212 213 214 215 216 217 218
} // 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()
219
{
jkobus's avatar
jkobus committed
220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 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
    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")));
    rows << RowData(TextLineData(QLatin1String("")));
    ChunkData chunk;
    chunk.rows = rows;
    QString patchText = header + QLatin1String("@@ -1,2 +1,1 @@\n"
                                               "-ABCD\n"
                                               " EFGH\n");
    QTest::newRow("Simple") << chunk
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("ABCD")));
    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");

    QTest::newRow("Last newline removed") << chunk
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

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

    QTest::newRow("Not a last newline removed") << chunk
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("ABCD")));
    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");

    QTest::newRow("Last newline added") << chunk
                            << fileName
                            << fileName
                            << true
                            << patchText;

    ///////////

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

    QTest::newRow("Not a last newline added") << chunk
                            << fileName
                            << fileName
                            << false
                            << patchText;

    ///////////

    rows.clear();
    rows << RowData(TextLineData(QLatin1String("ABCD")),
                    TextLineData(QLatin1String("EFGH")));
    rows << RowData(TextLineData(QLatin1String("")));
    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
                            << true
                            << patchText;

    ///////////

    // chunk the same here
    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;
406 407
}

jkobus's avatar
jkobus committed
408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455
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);

    QCOMPARE(patchText, result);
}

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"
Orgad Shaneh's avatar
Orgad Shaneh committed
456
                                " } // namespace DiffEditor\n");
jkobus's avatar
jkobus committed
457 458 459 460 461 462 463

    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
464 465
    chunkData1.leftStartingLineNumber = 186;
    chunkData1.rightStartingLineNumber = 186;
jkobus's avatar
jkobus committed
466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487
    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
488 489
    chunkData2.leftStartingLineNumber = 463;
    chunkData2.rightStartingLineNumber = 463;
jkobus's avatar
jkobus committed
490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533
    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);

    QList<FileData> fileDataList;
    fileDataList.append(fileData1);
    fileDataList.append(fileData2);

    QTest::newRow("Git patch") << patch
                               << fileDataList;
}

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
534 535 536 537 538
        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());
jkobus's avatar
jkobus committed
539 540 541
        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
542 543 544 545
            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
546 547 548
            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
549 550 551 552 553
                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
554 555 556 557 558 559 560
            }
        }
    }
}

#endif // WITH_TESTS

561

562
Q_EXPORT_PLUGIN(DiffEditor::Internal::DiffEditorPlugin)
jkobus's avatar
jkobus committed
563 564

#include "diffeditorplugin.moc"