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

33
src/plugins/clangformat/clangformatindenter.h
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
@@ -25,35 +25,20 @@
#pragma once
#include <texteditor/indenter.h>
#include "clangformatbaseindenter.h"
#include <texteditor/tabsettings.h>
namespace ClangFormat {
class ClangFormatIndenter final : public TextEditor::Indenter
class ClangFormatIndenter final : public ClangFormatBaseIndenter
{
public:
void indent(QTextDocument *doc,
const QTextCursor &cursor,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings,
bool autoTriggered = true) override;
void reindent(QTextDocument *doc,
const QTextCursor &cursor,
const TextEditor::TabSettings &tabSettings) override;
TextEditor::Replacements format(QTextDocument *doc,
const Utils::FileName &fileName,
const QTextCursor &cursor,
const TextEditor::TabSettings &tabSettings) override;
void indentBlock(QTextDocument *doc,
const QTextBlock &block,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings) override;
int indentFor(const QTextBlock &block, const TextEditor::TabSettings &tabSettings) override;
ClangFormatIndenter(QTextDocument *doc);
Utils::optional<TextEditor::TabSettings> tabSettings() const override;
bool isElectricCharacter(const QChar &ch) const override;
bool hasTabSettings() const override { return true; }
TextEditor::TabSettings tabSettings() const override;
private:
clang::format::FormatStyle styleForFile() const override;
};
} // namespace ClangFormat