diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 30 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 14 |
2 files changed, 30 insertions, 14 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index e5a8ad383b3..84f07ab28e8 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -278,7 +278,7 @@ public: State.ParenLevel = 0; State.StartOfStringLiteral = 0; State.StartOfLineLevel = State.ParenLevel; - State.LowestCallLevel = State.ParenLevel; + State.LowestLevelOnLine = State.ParenLevel; State.IgnoreStackForComparison = false; // The first token has already been indented and thus consumed. @@ -434,8 +434,8 @@ private: /// \brief The \c ParenLevel at the start of this line. unsigned StartOfLineLevel; - /// \brief The lowest \c ParenLevel of "." or "->" on the current line. - unsigned LowestCallLevel; + /// \brief The lowest \c ParenLevel on the current line. + unsigned LowestLevelOnLine; /// \brief The start column of the string literal, if we're in a string /// literal sequence, 0 otherwise. @@ -473,8 +473,8 @@ private: return ParenLevel < Other.ParenLevel; if (StartOfLineLevel != Other.StartOfLineLevel) return StartOfLineLevel < Other.StartOfLineLevel; - if (LowestCallLevel != Other.LowestCallLevel) - return LowestCallLevel < Other.LowestCallLevel; + if (LowestLevelOnLine != Other.LowestLevelOnLine) + return LowestLevelOnLine < Other.LowestLevelOnLine; if (StartOfStringLiteral != Other.StartOfStringLiteral) return StartOfStringLiteral < Other.StartOfStringLiteral; if (IgnoreStackForComparison || Other.IgnoreStackForComparison) @@ -580,7 +580,7 @@ private: Current.Type != TT_DesignatedInitializerPeriod) State.Stack.back().LastSpace += Current.CodePointCount; State.StartOfLineLevel = State.ParenLevel; - State.LowestCallLevel = State.ParenLevel; + State.LowestLevelOnLine = State.ParenLevel; // Any break on this level means that the parent level has been broken // and we need to avoid bin packing there. @@ -685,13 +685,14 @@ private: State.Stack.back().FirstLessLess = State.Column; if (Current.is(tok::question)) State.Stack.back().QuestionColumn = State.Column; - if (Current.isOneOf(tok::period, tok::arrow)) { - State.LowestCallLevel = std::min(State.LowestCallLevel, State.ParenLevel); - if (Line.Type == LT_BuilderTypeCall && State.ParenLevel == 0) - State.Stack.back().StartOfFunctionCall = - Current.LastInChainOfCalls ? 0 - : State.Column + Current.CodePointCount; - } + if (!Current.opensScope() && !Current.closesScope()) + State.LowestLevelOnLine = + std::min(State.LowestLevelOnLine, State.ParenLevel); + if (Current.isOneOf(tok::period, tok::arrow) && + Line.Type == LT_BuilderTypeCall && State.ParenLevel == 0) + State.Stack.back().StartOfFunctionCall = + Current.LastInChainOfCalls ? 0 + : State.Column + Current.CodePointCount; if (Current.Type == TT_CtorInitializerColon) { // Indent 2 from the column, so: // SomeClass::SomeClass() @@ -1047,7 +1048,8 @@ private: // SomeParameter, OtherParameter).DoSomething( // ... // As they hide "DoSomething" and are generally bad for readability. - if (Previous.opensScope() && State.LowestCallLevel < State.StartOfLineLevel) + if (Previous.opensScope() && + State.LowestLevelOnLine < State.StartOfLineLevel) return false; return !State.Stack.back().NoLineBreak; } diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index ed06bacd87d..9109781091e 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -3083,6 +3083,15 @@ TEST_F(FormatTest, WrapsTemplateDeclarations) { verifyFormat("void aaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" " bbbbbbbbbbbbbbbbbbbbbbbbbbbb>(\n" " ccccccccccccccccccccccccccccccccccccccccccccccc);"); + verifyFormat( + "aaaaaaaaaaaaa<aaaaaaaaaa, aaaaaaaaaaa,\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa> *aaaa =\n" + " new aaaaaaaaaaaaa<aaaaaaaaaa, aaaaaaaaaaa,\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>(\n" + " bbbbbbbbbbbbbbbbbbbbbbbb);", + getLLVMStyleWithColumns(72)); } TEST_F(FormatTest, WrapsAtNestedNameSpecifiers) { @@ -3488,6 +3497,11 @@ TEST_F(FormatTest, FormatsCasts) { verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *foo = (aaaaaaaaaaaaaaaaa *)\n" " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;"); + verifyFormat( + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa[\n" + " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] =\n" + " (*cccccccccccccccc)[\n" + " dddddddddddddddddddddddddddddddddddddddddddddddddddddddd];"); } TEST_F(FormatTest, FormatsFunctionTypes) { |
