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

Revert "ClangFormat: Remove format while typing feature"

Browse Source 
This reverts commit 323ba720db.

Reason for revert: The feature is needed

Change-Id: Iaf09ef91c49ff0c85c1b5906a1c1464bd8e4cae6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2022-06-29 09:59:58 +00:00
parent a0de1f1848
commit 8f1a9ea6d7
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/clangformat/tests/clangformat-test.cpp
View File

@@ -471,7 +471,7 @@ void ClangFormatTest::testIndentAfterFunctionBodyAndNotFormatBefore()
void ClangFormatTest::testReformatToEmptyFunction()
{
insertLines({"int foo(int a, int b, int c, int d)", "{", " ", "}"});
m_extendedIndenter->format({{1, 4}});
m_extendedIndenter->indentBlock(m_doc->findBlockByNumber(3), '}', TextEditor::TabSettings());
QCOMPARE(documentLines(), (std::vector<QString>{"int foo(int a, int b, int c, int d) {}"}));
}
@@ -483,10 +483,10 @@ void ClangFormatTest::testReformatToNonEmptyFunction()
QCOMPARE(documentLines(), (std::vector<QString>{"int foo(int a, int b) {", " ", "}"}));
}
void ClangFormatTest::testFormatClosingScope()
void ClangFormatTest::testIndentClosingScopeAndFormatBeforeIt()
{
insertLines({"if(a && b", " &&c && d", " ) {", "", "}"});
m_extendedIndenter->format({{1, 5}});
m_extendedIndenter->indentBlock(m_doc->findBlockByNumber(4), '}', TextEditor::TabSettings());
QCOMPARE(documentLines(), (std::vector<QString>{"if (a && b && c && d) {", "}"}));
}
@@ -504,17 +504,17 @@ void ClangFormatTest::testOnlyIndentIncompleteStatementOnElectricalCharacter()
QCOMPARE(documentLines(), (std::vector<QString>{"{bar();", " foo()", "}"}));
}
void ClangFormatTest::testFormatCompleteStatementOnSemicolon()
void ClangFormatTest::testIndentAndFormatCompleteStatementOnSemicolon()
{
insertLines({"{bar();", "foo();", "}"});
m_extendedIndenter->format({{1, 3}});
m_extendedIndenter->indentBlock(m_doc->findBlockByNumber(1), ';', TextEditor::TabSettings(), 14);
QCOMPARE(documentLines(), (std::vector<QString>{"{", " bar();", " foo();", "}"}));
}
void ClangFormatTest::testIndentAndFormatCompleteStatementOnClosingScope()
{
insertLines({"{bar();", "foo();", "}"});
m_extendedIndenter->format({{1, 3}});
m_extendedIndenter->indentBlock(m_doc->findBlockByNumber(1), '}', TextEditor::TabSettings(), 16);
QCOMPARE(documentLines(), (std::vector<QString>{"{", " bar();", " foo();", "}"}));
}