summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-01-04 20:40:51 +0000
committerDaniel Jasper <djasper@google.com>2015-01-04 20:40:51 +0000
commit5f1fa85e5bcbadb3e54326e54571915cdff03da1 (patch)
treeba6111c8c9ed9c08dd78b16e25bacb5c35a94aeb /clang/lib/Format
parentfd4ed1840207f10bc09729620a4abd0baaebeeb3 (diff)
downloadbcm5719-llvm-5f1fa85e5bcbadb3e54326e54571915cdff03da1.tar.gz
bcm5719-llvm-5f1fa85e5bcbadb3e54326e54571915cdff03da1.zip
clang-format: [Java] Fix incorrect recognition of annonymous classes.
Before: someFunction(new Runnable() { public void run() { System.out.println(42); } }); After: someFunction(new Runnable() { public void run() { System.out.println(42); } }); llvm-svn: 225142
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 6ff5405a1b4..02d49a0e1e2 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -1033,6 +1033,8 @@ void UnwrappedLineParser::parseParens() {
switch (FormatTok->Tok.getKind()) {
case tok::l_paren:
parseParens();
+ if (Style.Language == FormatStyle::LK_Java && FormatTok->is(tok::l_brace))
+ parseChildBlock();
break;
case tok::r_paren:
nextToken();
@@ -1043,12 +1045,11 @@ void UnwrappedLineParser::parseParens() {
case tok::l_square:
tryToParseLambda();
break;
- case tok::l_brace: {
+ case tok::l_brace:
if (!tryToParseBracedList()) {
parseChildBlock();
}
break;
- }
case tok::at:
nextToken();
if (FormatTok->Tok.is(tok::l_brace))
OpenPOWER on IntegriCloud