diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 97be71c277e..3199cd9d1f2 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1267,7 +1267,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, Left.Previous->is(tok::kw___attribute)) return false; if (Left.is(tok::l_paren) && (Left.Previous->Type == TT_BinaryOperator || - Left.Previous->is(tok::r_paren))) + Left.Previous->Type == TT_CastRParen)) return false; } diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 05119f37cb1..ecdb7216ba6 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -3335,6 +3335,10 @@ TEST_F(FormatTest, UnderstandsPointersToMembers) { " ((*a).*f)();\n" " a.*x;\n" "}"); + verifyFormat("void f() {\n" + " (a->*aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)(\n" + " aaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);\n" + "}"); FormatStyle Style = getLLVMStyle(); Style.PointerBindsToType = true; verifyFormat("typedef bool* (Class::*Member)() const;", Style); @@ -3633,6 +3637,11 @@ TEST_F(FormatTest, FormatsCasts) { verifyFormat("my_int a = (my_int)++ a;"); verifyFormat("my_int a = (my_int) + 2;"); + // Don't break after a cast's + verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaaa =\n" + " (aaaaaaaaaaaaaaaaaaaaaaaaaa *)(aaaaaaaaaaaaaaaaaaaaaa +\n" + " bbbbbbbbbbbbbbbbbbbbbb);"); + // These are not casts. verifyFormat("void f(int *) {}"); verifyFormat("f(foo)->b;"); |
