diff options
| author | Daniel Jasper <djasper@google.com> | 2016-01-09 15:56:47 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2016-01-09 15:56:47 +0000 |
| commit | 00693b08cf09af29bf3d0149538cfcf29bbf15a6 (patch) | |
| tree | 9cda10b87a3c0d3c1502ab688a3400856bf91e65 /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 804a276fcf0e328fc96fedf7ef158b5b0d5ad422 (diff) | |
| download | bcm5719-llvm-00693b08cf09af29bf3d0149538cfcf29bbf15a6.tar.gz bcm5719-llvm-00693b08cf09af29bf3d0149538cfcf29bbf15a6.zip | |
clang-format: Fix incorrect line break in certain configurations.
Before:
void aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaa,
vector<int>
bbbbbbbbbbbbbbb);
After:
void aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaa,
vector<int> bbbbbbbbbbbbbbb);
llvm-svn: 257257
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 535eac48030..ff2569d41aa 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -150,7 +150,8 @@ bool ContinuationIndenter::mustBreak(const LineState &State) { if (Previous.is(tok::semi) && State.LineContainsContinuedForLoopSection) return true; if ((startsNextParameter(Current, Style) || Previous.is(tok::semi) || - (Previous.is(TT_TemplateCloser) && Current.is(TT_StartOfName)) || + (Previous.is(TT_TemplateCloser) && Current.is(TT_StartOfName) && + Previous.NestingLevel == 1) || (Style.BreakBeforeTernaryOperators && Current.is(TT_ConditionalExpr) && Previous.isNot(tok::question)) || (!Style.BreakBeforeTernaryOperators && |
