Merge remote-tracking branch 'origin/8.0'

Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2

src/plugins/clangformat/clangformatbaseindenter.cpp

@@ -594,6 +594,18 @@ Utils::Text::Replacements ClangFormatBaseIndenter::indentsFor(QTextBlock startBl
     const QByteArray buffer = m_doc->toPlainText().toUtf8();
 
     ReplacementsToKeep replacementsToKeep = ReplacementsToKeep::OnlyIndent;
+    if (formatCodeInsteadOfIndent()
+        && (cursorPositionInEditor == -1 || cursorPositionInEditor >= startBlockPosition)
+        && (typedChar == ';' || typedChar == '}')) {
+        // Format before current position only in case the cursor is inside the indented block.
+        // So if cursor position is less then the block position then the current line is before
+        // the indented block - don't trigger extra formatting in this case.
+        // cursorPositionInEditor == -1 means the condition matches automatically.
+
+        // Format only before complete statement not to break code.
+        replacementsToKeep = ReplacementsToKeep::IndentAndBefore;
+    }
+
     return replacements(buffer,
                         startBlock,
                         endBlock,

src/plugins/clangformat/tests/clangformat-test.cpp

@@ -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();", "}"}));
 }
 

src/plugins/clangformat/tests/clangformat-test.h

@@ -90,10 +90,10 @@ private slots:
     void testIndentAfterFunctionBodyAndNotFormatBefore();
     void testReformatToEmptyFunction();
     void testReformatToNonEmptyFunction();
-    void testFormatClosingScope();
+    void testIndentClosingScopeAndFormatBeforeIt();
     void testDoNotFormatAfterTheFirstColon();
     void testOnlyIndentIncompleteStatementOnElectricalCharacter();
-    void testFormatCompleteStatementOnSemicolon();
+    void testIndentAndFormatCompleteStatementOnSemicolon();
     void testIndentAndFormatCompleteStatementOnClosingScope();
     void testOnlyIndentClosingParenthesis();
     void testEquallyIndentInsideParenthesis();