diff options
| author | Daniel Jasper <djasper@google.com> | 2015-05-18 14:12:24 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-05-18 14:12:24 +0000 |
| commit | cec9ffd2a244d0001768f529da797bd141e9f214 (patch) | |
| tree | dcfecffe79f6f3ff9cc482e20509275f17637d87 /clang/lib/Format | |
| parent | 47bbda093917d7e16f59df20ae409c07b4624e30 (diff) | |
| download | bcm5719-llvm-cec9ffd2a244d0001768f529da797bd141e9f214.tar.gz bcm5719-llvm-cec9ffd2a244d0001768f529da797bd141e9f214.zip | |
clang-format: Fix regression introduced by r237565.
Before:
class C : public D {
SomeClass SC { 2 };
};
After:
class C : public D {
SomeClass SC{2};
};
llvm-svn: 237568
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/UnwrappedLineParser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index d0a8cfbe69f..2331305cc53 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -351,7 +351,8 @@ void UnwrappedLineParser::calculateBraceTypes(bool ExpectClassBody) { NextTok->isOneOf(tok::comma, tok::period, tok::colon, tok::r_paren, tok::r_square, tok::l_brace, tok::l_paren, tok::ellipsis) || - (NextTok->is(tok::semi) && !ExpectClassBody) || + (NextTok->is(tok::semi) && + (!ExpectClassBody || LBraceStack.size() != 1)) || (NextTok->isBinaryOperator() && !NextIsObjCMethod); } if (ProbablyBracedList) { |
