summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/UnwrappedLineParser.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-03-13 10:11:17 +0000
committerDaniel Jasper <djasper@google.com>2014-03-13 10:11:17 +0000
commitac7e34e778e84ed4105d098811f67a9646549059 (patch)
tree3906fb2eabd5e3f403ae770c7d370b7da9a0b7c5 /clang/lib/Format/UnwrappedLineParser.cpp
parente8bd672d31bf69c836e2b07c4df9268a755c392f (diff)
downloadbcm5719-llvm-ac7e34e778e84ed4105d098811f67a9646549059.tar.gz
bcm5719-llvm-ac7e34e778e84ed4105d098811f67a9646549059.zip
clang-format: Prevent ObjC code from confusing the braced-init detection
This was leading to bad formatting, e.g.: Before: f(^{ @autoreleasepool { if (a) { g(); } } }); After: f(^{ @autoreleasepool { if (a) { g(); } } }); llvm-svn: 203777
Diffstat (limited to 'clang/lib/Format/UnwrappedLineParser.cpp')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index daf185be519..a3087ed9845 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -357,6 +357,7 @@ void UnwrappedLineParser::calculateBraceTypes() {
LBraceStack.pop_back();
}
break;
+ case tok::at:
case tok::semi:
case tok::kw_if:
case tok::kw_while:
OpenPOWER on IntegriCloud