summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/FormatToken.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-11-27 14:40:48 +0000
committerDaniel Jasper <djasper@google.com>2014-11-27 14:40:48 +0000
commit13404dad0d53763b46fda1516fc82565940bb03f (patch)
tree4f98dcac3be50f34c854f7ba76d581e32fcdd1e6 /clang/lib/Format/FormatToken.cpp
parentd977985e43885e71c5c8d40ad2e216f722463936 (diff)
downloadbcm5719-llvm-13404dad0d53763b46fda1516fc82565940bb03f.tar.gz
bcm5719-llvm-13404dad0d53763b46fda1516fc82565940bb03f.zip
clang-format: Don't use column layout with AlignAfterOpenBrackets.
This fixes llvm.org/PR21676. llvm-svn: 222886
Diffstat (limited to 'clang/lib/Format/FormatToken.cpp')
-rw-r--r--clang/lib/Format/FormatToken.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp
index 677f1a0bb13..badb3a39c82 100644
--- a/clang/lib/Format/FormatToken.cpp
+++ b/clang/lib/Format/FormatToken.cpp
@@ -138,6 +138,10 @@ void CommaSeparatedList::precomputeFormattingInfos(const FormatToken *Token) {
Commas.size() < 19)
return;
+ // Column format doesn't really make sense if we don't align after brackets.
+ if (!Style.AlignAfterOpenBracket)
+ return;
+
FormatToken *ItemBegin = Token->Next;
SmallVector<bool, 8> MustBreakBeforeItem;
OpenPOWER on IntegriCloud