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

12
src/plugins/texteditor/texteditor.cpp
View File

@@ -7135,21 +7135,11 @@ void TextEditorWidget::setIfdefedOutBlocks(const QList<BlockRange> &blocks)
documentLayout->requestUpdate();
}
static bool applyFormattingInsteadOfIndentation()
{
constexpr const char option[] = "QTC_FORMAT_INSTEAD_OF_INDENT";
return qEnvironmentVariableIsSet(option);
}
void TextEditorWidget::format()
{
static bool formattingInsteadOfIndentation = applyFormattingInsteadOfIndentation();
QTextCursor cursor = textCursor();
cursor.beginEditBlock();
if (formattingInsteadOfIndentation)
d->m_document->autoFormat(cursor);
else
d->m_document->autoIndent(cursor);
d->m_document->autoFormatOrIndent(cursor);
cursor.endEditBlock();
}