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

27
src/plugins/cpptools/cppqtstyleindenter.h
View File

@@ -27,10 +27,9 @@
#include "cpptools_global.h"
#include <texteditor/indenter.h>
#include <texteditor/textindenter.h>
namespace TextEditor
{
namespace TextEditor {
class ICodeStylePreferences;
}
@@ -38,32 +37,30 @@ namespace CppTools {
class CppCodeStyleSettings;
class CppCodeStylePreferences;
class CPPTOOLS_EXPORT CppQtStyleIndenter : public TextEditor::Indenter
class CPPTOOLS_EXPORT CppQtStyleIndenter : public TextEditor::TextIndenter
{
public:
CppQtStyleIndenter();
explicit CppQtStyleIndenter(QTextDocument *doc);
~CppQtStyleIndenter() override;
bool isElectricCharacter(const QChar &ch) const override;
void indentBlock(QTextDocument *doc,
const QTextBlock &block,
void indentBlock(const QTextBlock &block,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings) override;
void indent(QTextDocument *doc,
const QTextCursor &cursor,
void indent(const QTextCursor &cursor,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings,
bool autoTriggered = true) override;
const TextEditor::TabSettings &tabSettings) override;
void setCodeStylePreferences(TextEditor::ICodeStylePreferences *preferences) override;
void invalidateCache(QTextDocument *doc) override;
void invalidateCache() override;
int indentFor(const QTextBlock &block, const TextEditor::TabSettings &tabSettings) override;
TextEditor::IndentationForBlock indentationForBlocks(const QVector<QTextBlock> &blocks,
const TextEditor::TabSettings &tabSettings) override;
TextEditor::IndentationForBlock indentationForBlocks(
const QVector<QTextBlock> &blocks, const TextEditor::TabSettings &tabSettings) override;
private:
CppCodeStyleSettings codeStyleSettings() const;
CppCodeStylePreferences *m_cppCodeStylePreferences = nullptr;
};
} // CppTools
} // namespace CppTools