feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Beautifier: Move formatting tools to TextEditor

Browse Source 
Formatting is moved from Beautifier plugin to formattexteditor.h/.cpp.
Diff and Differ classes are extracted from DiffEditor to Utils
to prevent extra TextEditor dependencies.

This change will make possible to use formatCurrentFile
and similar functions not only from Beautifier code.

Change-Id: Ic5ca668afe88f4e9376d49e6bd3594807172b0dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-08-29 14:36:47 +02:00
parent 7777df42cf
commit 5c658ac968
26 changed files with 503 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/diffeditor/diffutils.h
View File

@@ -36,9 +36,9 @@ QT_END_NAMESPACE
namespace TextEditor { class FontSettings; }
namespace DiffEditor {
namespace Utils { class Diff; }
class Diff;
namespace DiffEditor {
class DIFFEDITOR_EXPORT DiffFileInfo {
public:
@@ -128,8 +128,8 @@ public:
GitFormat = AddLevel | 0x2, // Add line 'diff ..' as git does
};
static ChunkData calculateOriginalData(const QList<Diff> &leftDiffList,
const QList<Diff> &rightDiffList);
static ChunkData calculateOriginalData(const QList<Utils::Diff> &leftDiffList,
const QList<Utils::Diff> &rightDiffList);
static FileData calculateContextData(const ChunkData &originalData,
int contextLineCount,
int joinChunkThreshold = 1);