From 3e1bd1407b4a4f5dada15d99882abc45c976b997 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 14 Jan 2015 09:51:32 +0000 Subject: clang-format: [Java] Don't line-wrap before annotations' l_parens. Before: @SomeAnnotation (aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaa) int i; After: @SomeAnnotation( aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaa) int i; llvm-svn: 225963 --- clang/lib/Format/TokenAnnotator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/lib') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 11dd2be619d..351c6fa9e86 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1939,7 +1939,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, if (Left.Tok.getObjCKeywordID() == tok::objc_interface) return false; if (Left.isOneOf(TT_JavaAnnotation, TT_LeadingJavaAnnotation)) - return true; + return !Right.is(tok::l_paren); if (Right.isOneOf(TT_StartOfName, TT_FunctionDeclarationName) || Right.is(tok::kw_operator)) return true; -- cgit v1.2.3