clang-format: Improve formatting of ObjC dict literals.
Before:
NSDictionary *d = @{ @"nam" : NSUserNam(), @"dte" : [NSDate date],
@"processInfo" : [NSProcessInfo processInfo]
};
After:
NSDictionary *d = @{
@"nam" : NSUserNam(),
@"dte" : [NSDate date],
@"processInfo" : [NSProcessInfo processInfo]
};
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193049 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp
index 0cf9e32..63a03e0 100644
--- a/lib/Format/ContinuationIndenter.cpp
+++ b/lib/Format/ContinuationIndenter.cpp
@@ -136,6 +136,9 @@
!Previous.isOneOf(tok::kw_return, tok::lessless) &&
Previous.Type != TT_InlineASMColon && NextIsMultilineString(State))
return true;
+ if (Previous.Type == TT_ObjCDictLiteral && Previous.is(tok::l_brace) &&
+ getLengthToMatchingParen(Previous) + State.Column > getColumnLimit(State))
+ return true;
if (!Style.BreakBeforeBinaryOperators) {
// If we need to break somewhere inside the LHS of a binary expression, we
@@ -593,11 +596,15 @@
// If this '[' opens an ObjC call, determine whether all parameters fit into
// one line and put one per line if they don't.
- if (Current.is(tok::l_square) && Current.Type == TT_ObjCMethodExpr &&
+ if (Current.isOneOf(tok::l_brace, tok::l_square) &&
+ (Current.Type == TT_ObjCDictLiteral ||
+ Current.Type == TT_ObjCMethodExpr) &&
Current.MatchingParen != NULL) {
if (getLengthToMatchingParen(Current) + State.Column >
- getColumnLimit(State))
+ getColumnLimit(State)) {
State.Stack.back().BreakBeforeParameter = true;
+ State.Stack.back().AvoidBinPacking = true;
+ }
}
// If we encounter a closing ), ], } or >, we can remove a level from our