diff options
| author | Daniel Jasper <djasper@google.com> | 2016-01-27 20:14:23 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2016-01-27 20:14:23 +0000 |
| commit | 15b01116d90733c004b371960624f511f54d897a (patch) | |
| tree | 8d6aaf92f8d47be5e3a896efc8039b93a5d0c9b9 /clang/lib/Format | |
| parent | d36f7d5a9af82c1c6d5615ae1611995111e5486c (diff) | |
| download | bcm5719-llvm-15b01116d90733c004b371960624f511f54d897a.tar.gz bcm5719-llvm-15b01116d90733c004b371960624f511f54d897a.zip | |
clang-format: [Java] Remove unnecessary line break after complex annotations
Before:
@Annotation("Some"
+ " text")
List<Integer>
list;
After:
@Annotation("Some"
+ " text")
List<Integer> list;
llvm-svn: 258981
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index b820f53db52..07b90090ac2 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -151,6 +151,7 @@ bool ContinuationIndenter::mustBreak(const LineState &State) { return true; if ((startsNextParameter(Current, Style) || Previous.is(tok::semi) || (Previous.is(TT_TemplateCloser) && Current.is(TT_StartOfName) && + Style.Language == FormatStyle::LK_Cpp && // FIXME: This is a temporary workaround for the case where clang-format // sets BreakBeforeParameter to avoid bin packing and this creates a // completely unnecessary line break after a template type that isn't |
