diff options
| author | Daniel Jasper <djasper@google.com> | 2015-01-14 09:51:32 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-01-14 09:51:32 +0000 |
| commit | 3e1bd1407b4a4f5dada15d99882abc45c976b997 (patch) | |
| tree | 570ecd50b125d5d82ec4b78458e3a12fa992bf1c /clang/lib/Format | |
| parent | a831c58e53a8a37169ede3e9dcbadf0873ef47c8 (diff) | |
| download | bcm5719-llvm-3e1bd1407b4a4f5dada15d99882abc45c976b997.tar.gz bcm5719-llvm-3e1bd1407b4a4f5dada15d99882abc45c976b997.zip | |
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
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |

