From c7d024ac53970a6b7cf4c05566989532f16bcf79 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 21 Oct 2014 10:02:03 +0000 Subject: [PATCH] clang-format: [Java] Make annotation formatting more consistent. Before: DoSomething(new A() { @Override public String toString() { } }); After: DoSomething(new A() { @Override public String toString() { } }); llvm-svn: 220282 --- clang/lib/Format/TokenAnnotator.cpp | 2 +- clang/unittests/Format/FormatTestJava.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 4493471d217f..ba08ace1e8bd 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1797,7 +1797,7 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line, return true; } else if (Style.Language == FormatStyle::LK_Java) { if (Left.Type == TT_JavaAnnotation && Right.isNot(tok::l_paren) && - Line.MightBeFunctionDecl) + Line.Last->is(tok::l_brace)) return true; } diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 49c95a8753b8..00809bea91fc 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -75,6 +75,12 @@ TEST_F(FormatTestJava, Annotations) { verifyFormat("@SuppressWarnings(value = \"unchecked\")\n" "public void doSomething() {\n}"); + verifyFormat("DoSomething(new A() {\n" + " @Override\n" + " public String toString() {\n" + " }\n" + "});"); + verifyFormat("@Partial @Mock DataLoader loader;"); }