summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-05-06 12:48:06 +0000
committerDaniel Jasper <djasper@google.com>2015-05-06 12:48:06 +0000
commiteb53668c3501150ad99bd35df604dff3b5c9e079 (patch)
tree750117685e4d5ff0fbf9a43387b3493006a5dfb5 /clang/lib/Format
parentd35f388b49500ca52cd91947abc5cba47e382bf3 (diff)
downloadbcm5719-llvm-eb53668c3501150ad99bd35df604dff3b5c9e079.tar.gz
bcm5719-llvm-eb53668c3501150ad99bd35df604dff3b5c9e079.zip
clang-format: Properly indent method calls without inputs.
Before: [aaaaaaaaaaa aaaaaaa]; After: [aaaaaaaaaaa aaaaaaa]; llvm-svn: 236597
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/ContinuationIndenter.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index 44b86a76ef2..83f719bd1c9 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -584,10 +584,12 @@ unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
return State.Stack.back().StartOfArraySubscripts;
return ContinuationIndent;
}
+ if (NextNonComment->is(TT_StartOfName) && NextNonComment->Next &&
+ NextNonComment->Next->is(TT_ObjCMethodExpr))
+ return State.Stack.back().Indent;
if (NextNonComment->isOneOf(TT_StartOfName, TT_PointerOrReference) ||
- Previous.isOneOf(tok::coloncolon, tok::equal)) {
+ Previous.isOneOf(tok::coloncolon, tok::equal))
return ContinuationIndent;
- }
if (PreviousNonComment && PreviousNonComment->is(tok::colon) &&
PreviousNonComment->isOneOf(TT_ObjCMethodExpr, TT_DictLiteral))
return ContinuationIndent;
OpenPOWER on IntegriCloud