forked from qt-creator/qt-creator
9c2cdc8965
Simplify the implementation a lot. Change-Id: I3f5daa3d2ce14c28d48c2e1e996ec4935d1dae3f Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
113 lines
3.9 KiB
C++
113 lines
3.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
** 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.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef DIFFUTILS_H
|
|
#define DIFFUTILS_H
|
|
|
|
#include <QString>
|
|
#include <QMap>
|
|
#include <QTextEdit>
|
|
|
|
#include "diffeditorcontroller.h"
|
|
#include "texteditor/texteditorconstants.h"
|
|
|
|
namespace TextEditor { class FontSettings; }
|
|
|
|
namespace DiffEditor {
|
|
|
|
class Diff;
|
|
|
|
namespace Internal {
|
|
|
|
class TextLineData {
|
|
public:
|
|
enum TextLineType {
|
|
TextLine,
|
|
Separator,
|
|
Invalid
|
|
};
|
|
TextLineData() : textLineType(Invalid) {}
|
|
TextLineData(const QString &txt) : textLineType(TextLine), text(txt) {}
|
|
TextLineData(TextLineType t) : textLineType(t) {}
|
|
TextLineType textLineType;
|
|
QString text;
|
|
/*
|
|
* <start position, end position>
|
|
* <-1, n> means this is a continuation from the previous line
|
|
* <n, -1> means this will be continued in the next line
|
|
* <-1, -1> the whole line is a continuation (from the previous line to the next line)
|
|
*/
|
|
QMap<int, int> changedPositions; // counting from the beginning of the line
|
|
};
|
|
|
|
class RowData {
|
|
public:
|
|
RowData() : equal(false) {}
|
|
RowData(const TextLineData &l)
|
|
: leftLine(l), rightLine(l), equal(true) {}
|
|
RowData(const TextLineData &l, const TextLineData &r)
|
|
: leftLine(l), rightLine(r), equal(false) {}
|
|
TextLineData leftLine;
|
|
TextLineData rightLine;
|
|
bool equal;
|
|
};
|
|
|
|
class ChunkData {
|
|
public:
|
|
ChunkData() : contextChunk(false) {}
|
|
QList<RowData> rows;
|
|
bool contextChunk;
|
|
};
|
|
|
|
class FileData {
|
|
public:
|
|
FileData() {}
|
|
FileData(const ChunkData &chunkData) { chunks.append(chunkData); }
|
|
QList<ChunkData> chunks;
|
|
DiffEditorController::DiffFileInfo leftFileInfo;
|
|
DiffEditorController::DiffFileInfo rightFileInfo;
|
|
};
|
|
|
|
ChunkData calculateOriginalData(const QList<Diff> &leftDiffList,
|
|
const QList<Diff> &rightDiffList);
|
|
FileData calculateContextData(const ChunkData &originalData,
|
|
int contextLinesNumber);
|
|
void addChangedPositions(int positionOffset,
|
|
const QMap<int, int> &originalChangedPositions,
|
|
QMap<int, int> *changedPositions);
|
|
QList<QTextEdit::ExtraSelection> colorPositions(const QTextCharFormat &format,
|
|
QTextCursor &cursor,
|
|
const QMap<int, int> &positions);
|
|
QTextCharFormat fullWidthFormatForTextStyle(const TextEditor::FontSettings &fontSettings,
|
|
TextEditor::TextStyle textStyle);
|
|
} // namespace Internal
|
|
} // namespace DiffEditor
|
|
|
|
#endif // DIFFUTILS_H
|