diff options
author | Daniel Jasper <djasper@google.com> | 2015-01-14 10:36:31 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-01-14 10:36:31 +0000 |
commit | 190fbda6ded9cfdf67b0903e82a0cd0853da3a73 (patch) | |
tree | 9da7a0f8cbca8c62192f5a0ab81d865d3b79a840 /clang/lib/Format | |
parent | a18dcf7efdf0a0574bbdf67cfa66f51aa3373568 (diff) | |
download | bcm5719-llvm-190fbda6ded9cfdf67b0903e82a0cd0853da3a73.tar.gz bcm5719-llvm-190fbda6ded9cfdf67b0903e82a0cd0853da3a73.zip |
clang-format: [Java] Prefer not to break in parameter annotations.
Before:
boolean someFunction(@Param(aaaaaaaaaaaaaaaa)
String aaaaa,
String bbbbbbbbbbbbbbb) {}
After:
boolean someFunction(
@Param(aaaaaaaaaaaaaaaa) String aaaaa,
String bbbbbbbbbbbbbbb) {}
llvm-svn: 225971
Diffstat (limited to 'clang/lib/Format')
-rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 34d8835c763..d0d888fa4d4 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1587,6 +1587,8 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return Left.ParameterCount > 1 ? Style.PenaltyBreakBeforeFirstCallParameter : 19; } + if (Left.is(TT_JavaAnnotation)) + return 50; if (Right.is(tok::lessless)) { if (Left.is(tok::string_literal)) { |