summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/ContinuationIndenter.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-10-22 15:45:58 +0000
committerDaniel Jasper <djasper@google.com>2013-10-22 15:45:58 +0000
commitb8f61682182ed8b8a641761d9948506eac397796 (patch)
tree7807ded6d1b8c988e9da48d5f9a62d1d4f0c53d9 /clang/lib/Format/ContinuationIndenter.cpp
parent1db6c3868760d6c9c05b238b636f155d3247ecc2 (diff)
downloadbcm5719-llvm-b8f61682182ed8b8a641761d9948506eac397796.tar.gz
bcm5719-llvm-b8f61682182ed8b8a641761d9948506eac397796.zip
clang-format: Fix ObjC literal indentation in Google style.
Style guide demands a two-space indent. Before: NSArray *arguments = @[ kind == kUserTicket ? @"--user-store" : @"--system-store", @"--print-tickets", @"--productid", @"com.google.Chrome" ]; After: NSArray *arguments = @[ kind == kUserTicket ? @"--user-store" : @"--system-store", @"--print-tickets", @"--productid", @"com.google.Chrome" ]; llvm-svn: 193168
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
-rw-r--r--clang/lib/Format/ContinuationIndenter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index 18f0c33452d..16b1147fd58 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -562,11 +562,11 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State,
BreakBeforeParameter = true;
} else {
NewIndent = State.Stack.back().LastSpace;
- if (Style.Cpp11BracedListStyle)
- NewIndent += Style.ContinuationIndentWidth;
- else {
+ if (Current.opensBlockTypeList(Style)) {
NewIndent += Style.IndentWidth;
++NewIndentLevel;
+ } else {
+ NewIndent += Style.ContinuationIndentWidth;
}
}
const FormatToken *NextNoComment = Current.getNextNonComment();
OpenPOWER on IntegriCloud