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

ClangFormat: Refactor indenter to allow ClangFormat unit-tests

Browse Source 
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>
This commit is contained in:
Ivan Donchevskii
2019-01-16 09:37:54 +01:00
parent 8b5beeb952
commit d7058e1afe
71 changed files with 1200 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmljstools/qmljsindenter.cpp
View File

@@ -35,7 +35,9 @@
using namespace QmlJSEditor;
using namespace Internal;
Indenter::Indenter() = default;
Indenter::Indenter(QTextDocument *doc)
: TextEditor::TextIndenter(doc)
{}
Indenter::~Indenter() = default;
@@ -49,13 +51,10 @@ bool Indenter::isElectricCharacter(const QChar &ch) const
return false;
}
void Indenter::indentBlock(QTextDocument *doc,
const QTextBlock &block,
void Indenter::indentBlock(const QTextBlock &block,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings)
{
Q_UNUSED(doc)
const int depth = indentFor(block, tabSettings);
if (depth == -1)
return;
@@ -74,29 +73,24 @@ void Indenter::indentBlock(QTextDocument *doc,
tabSettings.indentLine(block, depth);
}
void Indenter::invalidateCache(QTextDocument *doc)
void Indenter::invalidateCache()
{
QmlJSTools::CreatorCodeFormatter codeFormatter;
codeFormatter.invalidateCache(doc);
codeFormatter.invalidateCache(m_doc);
}
int Indenter::indentFor(const QTextBlock &block,
const TextEditor::TabSettings &tabSettings)
int Indenter::indentFor(const QTextBlock &block, const TextEditor::TabSettings &tabSettings)
{
QmlJSTools::CreatorCodeFormatter codeFormatter(tabSettings);
codeFormatter.updateStateUntil(block);
return codeFormatter.indentFor(block);
}
TextEditor::IndentationForBlock
Indenter::indentationForBlocks(const QVector<QTextBlock> &blocks,
const TextEditor::TabSettings &tabSettings)
TextEditor::IndentationForBlock Indenter::indentationForBlocks(
const QVector<QTextBlock> &blocks, const TextEditor::TabSettings &tabSettings)
{
QmlJSTools::CreatorCodeFormatter codeFormatter(tabSettings);
codeFormatter.updateStateUntil(blocks.last());
TextEditor::IndentationForBlock ret;