forked from qt-creator/qt-creator
2144fb5949
It doesn't freeze creator anymore. Task-number: QTCREATORBUG-14255 Change-Id: I3d06ea7a848e321c6072e00a73b96e9ea9770b6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
118 lines
4.6 KiB
C++
118 lines
4.6 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** 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 The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include "diffeditor_global.h"
|
|
#include <QString>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
template <class K, class T>
|
|
class QMap;
|
|
class QFutureInterfaceBase;
|
|
QT_END_NAMESPACE
|
|
|
|
namespace DiffEditor {
|
|
|
|
class DIFFEDITOR_EXPORT Diff
|
|
{
|
|
public:
|
|
enum Command {
|
|
Delete,
|
|
Insert,
|
|
Equal
|
|
};
|
|
Command command;
|
|
QString text;
|
|
Diff(Command com, const QString &txt = QString());
|
|
Diff();
|
|
bool operator==(const Diff &other) const;
|
|
bool operator!=(const Diff &other) const;
|
|
QString toString() const;
|
|
static QString commandString(Command com);
|
|
};
|
|
|
|
class DIFFEDITOR_EXPORT Differ
|
|
{
|
|
public:
|
|
enum DiffMode
|
|
{
|
|
CharMode,
|
|
WordMode,
|
|
LineMode
|
|
};
|
|
Differ(QFutureInterfaceBase *jobController = nullptr);
|
|
QList<Diff> diff(const QString &text1, const QString &text2);
|
|
QList<Diff> unifiedDiff(const QString &text1, const QString &text2);
|
|
void setDiffMode(DiffMode mode);
|
|
DiffMode diffMode() const;
|
|
static QList<Diff> merge(const QList<Diff> &diffList);
|
|
static QList<Diff> cleanupSemantics(const QList<Diff> &diffList);
|
|
static QList<Diff> cleanupSemanticsLossless(const QList<Diff> &diffList);
|
|
|
|
static void splitDiffList(const QList<Diff> &diffList,
|
|
QList<Diff> *leftDiffList,
|
|
QList<Diff> *rightDiffList);
|
|
static QList<Diff> moveWhitespaceIntoEqualities(const QList<Diff> &input);
|
|
static void diffWithWhitespaceReduced(const QString &leftInput,
|
|
const QString &rightInput,
|
|
QList<Diff> *leftOutput,
|
|
QList<Diff> *rightOutput);
|
|
static void unifiedDiffWithWhitespaceReduced(const QString &leftInput,
|
|
const QString &rightInput,
|
|
QList<Diff> *leftOutput,
|
|
QList<Diff> *rightOutput);
|
|
static void ignoreWhitespaceBetweenEqualities(const QList<Diff> &leftInput,
|
|
const QList<Diff> &rightInput,
|
|
QList<Diff> *leftOutput,
|
|
QList<Diff> *rightOutput);
|
|
static void diffBetweenEqualities(const QList<Diff> &leftInput,
|
|
const QList<Diff> &rightInput,
|
|
QList<Diff> *leftOutput,
|
|
QList<Diff> *rightOutput);
|
|
|
|
private:
|
|
QList<Diff> preprocess1AndDiff(const QString &text1, const QString &text2);
|
|
QList<Diff> preprocess2AndDiff(const QString &text1, const QString &text2);
|
|
QList<Diff> diffMyers(const QString &text1, const QString &text2);
|
|
QList<Diff> diffMyersSplit(const QString &text1, int x,
|
|
const QString &text2, int y);
|
|
QList<Diff> diffNonCharMode(const QString &text1, const QString &text2);
|
|
QStringList encode(const QString &text1,
|
|
const QString &text2,
|
|
QString *encodedText1,
|
|
QString *encodedText2);
|
|
QString encode(const QString &text,
|
|
QStringList *lines,
|
|
QMap<QString, int> *lineToCode);
|
|
int findSubtextEnd(const QString &text,
|
|
int subTextStart);
|
|
DiffMode m_diffMode;
|
|
DiffMode m_currentDiffMode;
|
|
QFutureInterfaceBase *m_jobController = nullptr;
|
|
};
|
|
|
|
} // namespace DiffEditor
|