Author: djasper
Date: Tue Oct 21 05:58:14 2014
New Revision: 220284
URL: http://llvm.org/viewvc/llvm-project?rev=220284&view=rev
Log:
clang-format: [Java] Improve annotation handling.
Before:
@SuppressWarnings(
value = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") public static int
iiiiiiiiiiiiiiiiiiiiiiii;
After:
@SuppressWarnings(value = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
public static int iiiiiiiiiiiiiiiiiiiiiiii;
Modified:
cfe/trunk/lib/Format/TokenAnnotator.cpp
cfe/trunk/unittests/Format/FormatTestJava.cpp
Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=220284&r1=220283&r2=220284&view=diff
==============================================================================
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Tue Oct 21 05:58:14 2014
@@ -1817,6 +1817,8 @@ bool TokenAnnotator::canBreakBefore(cons
return false;
if (Left.Tok.getObjCKeywordID() == tok::objc_interface)
return false;
+ if (Left.Type == TT_JavaAnnotation)
+ return true;
if (Right.Type == TT_StartOfName ||
Right.Type == TT_FunctionDeclarationName || Right.is(tok::kw_operator))
return true;
Modified: cfe/trunk/unittests/Format/FormatTestJava.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJava.cpp?rev=220284&r1=220283&r2=220284&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTestJava.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTestJava.cpp Tue Oct 21 05:58:14 2014
@@ -82,6 +82,8 @@ TEST_F(FormatTestJava, Annotations) {
"});");
verifyFormat("@Partial @Mock DataLoader loader;");
+ verifyFormat("@SuppressWarnings(value =
\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\")\n"
+ "public static int iiiiiiiiiiiiiiiiiiiiiiii;");
}
TEST_F(FormatTestJava, Generics) {
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
