1 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index e0106d94cf8..d0750af1b0f 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -338,6 +338,11 @@ void UnwrappedLineParser::calculateBraceTypes() {
           if (Style.Language == FormatStyle::LK_Proto) {
             ProbablyBracedList = NextTok->isOneOf(tok::comma, tok::r_square);
           } else {
+            // Using OriginalColumn to distinguish between ObjC methods and
+            // binary operators is a bit hacky.
+            bool NextIsObjCMethod = NextTok->isOneOf(tok::plus, tok::minus) &&
+                                    NextTok->OriginalColumn == 0;
+
             // If there is a comma, semicolon or right paren after the closing
             // brace, we assume this is a braced initializer list.  Note that
             // regardless how we mark inner braces here, we will overwrite the
@@ -350,8 +355,7 @@ void UnwrappedLineParser::calculateBraceTypes() {
                 NextTok->isOneOf(tok::comma, tok::semi, tok::period, tok::colon,
                                  tok::r_paren, tok::r_square, tok::l_brace,
                                  tok::l_paren) ||
-                (NextTok->isBinaryOperator() &&
-                 !NextTok->isOneOf(tok::plus, tok::minus));
+                (NextTok->isBinaryOperator() && !NextIsObjCMethod);
           }
           if (ProbablyBracedList) {
             Tok->BlockKind = BK_BracedInit;