diff options
| -rw-r--r-- | lib/Format/Format.cpp | 4 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 0c486e0be3..89fbf61da0 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1176,8 +1176,8 @@ private: if (Right.is(tok::identifier) && !Right.Children.empty() && Right.Children[0].is(tok::colon) && Left.is(tok::identifier)) return true; - if (CurrentLineType == LT_ObjCMethodDecl && Right.is(tok::identifier) && - Left.is(tok::l_paren) && Left.Parent->is(tok::colon)) + if (Right.is(tok::identifier) && Left.is(tok::l_paren) && + Left.Parent->is(tok::colon)) // Don't break this identifier as ':' or identifier // before it will break. return false; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 90bdb67cff..84ce0c1e06 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1515,7 +1515,6 @@ TEST_F(FormatTest, FormatObjCMethodExpr) { verifyFormat("[self stuffWithInt:a ? (e ? f : g) : c];"); verifyFormat("[cond ? obj1 : obj2 methodWithParam:param]"); - verifyFormat("arr[[self indexForFoo:a]];"); verifyFormat("throw [self errorFor:a];"); verifyFormat("@throw [self errorFor:a];"); |