diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2019-01-16 09:37:54 +0100 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2019-01-22 09:52:15 +0000 |
commit | d7058e1afedfe609ff6e81222bd2137922bf7de3 (patch) | |
tree | 62d16136c8336646b8ef0ad4d220b7e0e8331203 /src/plugins/android/javaindenter.cpp | |
parent | 8b5beeb952448540a3834333b694919563d81ee2 (diff) | |
download | qt-creator-d7058e1afedfe609ff6e81222bd2137922bf7de3.tar.gz |
ClangFormat: Refactor indenter to allow ClangFormat unit-tests
We do not build texteditor files in unit-tests so some tricks
were required to make ClangFormatIndenter available.
First simple unit-test proofs it builds and runs.
Change-Id: I81d5ea099bd27fd1c1ed8b5b7877299dcc62a67f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/android/javaindenter.cpp')
-rw-r--r-- | src/plugins/android/javaindenter.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/android/javaindenter.cpp b/src/plugins/android/javaindenter.cpp index 6b6d45d7ce..270e9cf988 100644 --- a/src/plugins/android/javaindenter.cpp +++ b/src/plugins/android/javaindenter.cpp @@ -31,7 +31,9 @@ using namespace Android; using namespace Android::Internal; -JavaIndenter::JavaIndenter() = default; +JavaIndenter::JavaIndenter(QTextDocument *doc) + : TextEditor::TextIndenter(doc) +{} JavaIndenter::~JavaIndenter() = default; @@ -44,20 +46,17 @@ bool JavaIndenter::isElectricCharacter(const QChar &ch) const return false; } -void JavaIndenter::indentBlock(QTextDocument *doc, - const QTextBlock &block, +void JavaIndenter::indentBlock(const QTextBlock &block, const QChar &typedChar, const TextEditor::TabSettings &tabSettings) { - Q_UNUSED(doc); int indent = indentFor(block, tabSettings); if (typedChar == QLatin1Char('}')) indent -= tabSettings.m_indentSize; tabSettings.indentLine(block, qMax(0, indent)); } -int JavaIndenter::indentFor(const QTextBlock &block, - const TextEditor::TabSettings &tabSettings) +int JavaIndenter::indentFor(const QTextBlock &block, const TextEditor::TabSettings &tabSettings) { QTextBlock previous = block.previous(); if (!previous.isValid()) |