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

ClangFormat: Introduce check to format code instead of indenting

Browse Source 
Ctrl+I with the new check will reformat the selected code or
the current line instead.

Change-Id: Ia5a72c4a09621034d0dfe463f669fe1ca36b0b5f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-01-28 07:54:05 +01:00
parent 9d046826f8
commit 80fb0178fd
17 changed files with 182 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/clangformat/clangformatbaseindenter.cpp
View File

@@ -317,8 +317,7 @@ void ClangFormatBaseIndenter::reindent(const QTextCursor &cursor,
indent(cursor, QChar::Null);
}
TextEditor::Replacements ClangFormatBaseIndenter::format(
const QTextCursor &cursor, const TextEditor::TabSettings & /*tabSettings*/)
TextEditor::Replacements ClangFormatBaseIndenter::format(const QTextCursor &cursor)
{
int utf8Offset;
int utf8Length;
@@ -345,6 +344,12 @@ TextEditor::Replacements ClangFormatBaseIndenter::format(
return toReplace;
}
TextEditor::Replacements ClangFormatBaseIndenter::format(
const QTextCursor &cursor, const TextEditor::TabSettings & /*tabSettings*/)
{
return format(cursor);
}
void ClangFormatBaseIndenter::indentBlock(const QTextBlock &block, const QChar &typedChar)
{
trimFirstNonEmptyBlock(block);
@@ -405,6 +410,16 @@ bool ClangFormatBaseIndenter::isElectricCharacter(const QChar &ch) const
return false;
}
void ClangFormatBaseIndenter::formatOrIndent(const QTextCursor &cursor,
const TextEditor::TabSettings & /*tabSettings*/,
int /*cursorPositionInEditor*/)
{
if (formatCodeInsteadOfIndent())
format(cursor);
else
indent(cursor, QChar::Null);
}
clang::format::FormatStyle ClangFormatBaseIndenter::styleForFile() const
{
llvm::Expected<clang::format::FormatStyle> style