diff options
| -rw-r--r-- | lib/Format/Format.cpp | 7 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index bae1bbb86d..99b2d545c2 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -550,9 +550,10 @@ private: State.Stack[ParenLevel].FirstLessLess != 0) { State.Column = State.Stack[ParenLevel].FirstLessLess; } else if (ParenLevel != 0 && - (Previous.is(tok::equal) || Current.is(tok::arrow) || - Current.is(tok::period) || Previous.is(tok::question) || - Previous.Type == TT_ConditionalExpr)) { + (Previous.is(tok::equal) || Previous.is(tok::coloncolon) || + Previous.is(tok::question) || + Previous.Type == TT_ConditionalExpr || + Current.is(tok::period) || Current.is(tok::arrow))) { // Indent and extra 4 spaces after if we know the current expression is // continued. Don't do that on the top level, as we already indent 4 // there. diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index d877dc29e5..e47c7a5196 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1252,7 +1252,7 @@ TEST_F(FormatTest, WrapsAtNestedNameSpecifiers) { // "bbbbb..." here instead of what we are doing now. verifyFormat( "aaaaaaaaaaaaaaa(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb::\n" - " cccccccccccccccccccccccccccccccccccccccccccccccccc());"); + " cccccccccccccccccccccccccccccccccccccccccccccc());"); // Breaking at nested name specifiers is generally not desirable. verifyFormat( |