diff options
| author | Daniel Jasper <djasper@google.com> | 2014-05-22 13:53:55 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-05-22 13:53:55 +0000 |
| commit | 565ed5ed08fda3af5d26d6f0a47f4bb36d3e8b57 (patch) | |
| tree | 950cf368c48583baddf4f0b25ddeed96a0cb27d2 /clang/lib/Format | |
| parent | 498e56adb6c05d69afc300eeadce12fadfc3e477 (diff) | |
| download | bcm5719-llvm-565ed5ed08fda3af5d26d6f0a47f4bb36d3e8b57.tar.gz bcm5719-llvm-565ed5ed08fda3af5d26d6f0a47f4bb36d3e8b57.zip | |
clang-format: Don't use Allman brace breaking for ObjC blocks.
It just seems wrong. This fixes llvm.org/PR19736.
llvm-svn: 209440
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index ce847d6427e..f057ef7f3e7 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1595,7 +1595,8 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line, Style.BreakConstructorInitializersBeforeComma && !Style.ConstructorInitializerAllOnOneLineOrOnePerLine) { return true; - } else if (Right.is(tok::l_brace) && (Right.BlockKind == BK_Block)) { + } else if (Right.is(tok::l_brace) && Right.BlockKind == BK_Block && + Right.Type != TT_ObjCBlockLBrace) { return Style.BreakBeforeBraces == FormatStyle::BS_Allman || Style.BreakBeforeBraces == FormatStyle::BS_GNU; } else if (Right.is(tok::string_literal) && |
