diff options
author | Daniel Jasper <djasper@google.com> | 2015-01-14 09:47:57 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-01-14 09:47:57 +0000 |
commit | eefc8004c05ec58dd25dedc3e52592e3fcf36d12 (patch) | |
tree | b1c34216a812b46193b63c0d06f84d743159b24f | |
parent | 44b2f1c9c2bc19d85783fe0d3a9491478aece3d5 (diff) |
clang-format: [Java] Don't get confused by leading annotations.
Before:
@Test(a)
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaa(
aaaaaaaaaaaaaaaaaaaaaaa);
After:
@Test(a)
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =
aaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa);
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@225962 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Format/TokenAnnotator.cpp | 3 | ||||
-rw-r--r-- | unittests/Format/FormatTestJava.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index b4eb3656bd..11dd2be619 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -458,7 +458,8 @@ private: return false; if (Line.MustBeDeclaration && Contexts.size() == 1 && !Contexts.back().IsExpression && Line.First->isNot(TT_ObjCProperty) && - (!Tok->Previous || Tok->Previous->isNot(tok::kw_decltype))) + (!Tok->Previous || + !Tok->Previous->isOneOf(tok::kw_decltype, TT_LeadingJavaAnnotation))) Line.MightBeFunctionDecl = true; break; case tok::l_square: diff --git a/unittests/Format/FormatTestJava.cpp b/unittests/Format/FormatTestJava.cpp index 3c7cf32768..a3e86d6f65 100644 --- a/unittests/Format/FormatTestJava.cpp +++ b/unittests/Format/FormatTestJava.cpp @@ -276,6 +276,9 @@ TEST_F(FormatTestJava, Annotations) { "DataLoader loooooooooooooooooooooooader =\n" " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;", getStyleWithColumns(60)); + verifyFormat("@Test(a)\n" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa);"); } TEST_F(FormatTestJava, Generics) { |