[clang-format] Continue after non-scope-closers in getLengthToMatchingParen

[krasimir]

Summary

This fixes a regression introduced by r331857 where we stop the search for
the End token as soon as we hit a non-scope-closer, which prematurely stops before
semicolons for example, which should otherwise be considered as part of the unbreakable tail.

lib/Format/ContinuationIndenter.cpp

static unsigned getLengthToMatchingParen(const FormatToken &Tok,
   // LParen is not found in the initial portion of the stack up to
   // MatchingStackIndex.
   auto FindParenState = [&](const FormatToken *LBrace) -> const ParenState * {
     while (MatchingStackIndex >= 0 && Stack[MatchingStackIndex].Tok != LBrace)
       --MatchingStackIndex;
     return MatchingStackIndex >= 0 ? &Stack[MatchingStackIndex] : nullptr;
   };
   for (; End->Next; End = End->Next) {
-    if (End->Next->CanBreakBefore || !End->Next->closesScope())
+    if (End->Next->CanBreakBefore)
       break;
+    if (!End->Next->closesScope())
+      continue;
     if (End->Next->MatchingParen->isOneOf(tok::l_brace,
                                           TT_ArrayInitializerLSquare,
                                           tok::less)) {
       const ParenState *State = FindParenState(End->Next->MatchingParen);
       if (State && State->BreakBeforeClosingBrace)
         break;
     }
   }

unittests/Format/FormatTestObjC.cpp

TEST_F(FormatTestObjC, ObjCArrayLiterals) {
   Style.SpacesInContainerLiterals = true;
   Style.ColumnLimit = 20;
   // We can't break string literals inside NSArray literals
   // (that raises -Wobjc-string-concatenation).
   verifyFormat("NSArray *foo = @[\n"
                "  @\"aaaaaaaaaaaaaaaaaaaaaaaaaa\"\n"
                "];\n");
 }
+
+TEST_F(FormatTestObjC, BreaksCallStatementWhereSemiJustOverTheLimit) {
+  Style.ColumnLimit = 60;
+  // If the statement starting with 'a = ...' is put on a single line, the ';'
+  // is at line 61.
+  verifyFormat("int f(int a) {\n"
+               "  a = [self aaaaaaaaaa:bbbbbbbbb\n"
+               "             ccccccccc:dddddddd\n"
+               "                    ee:fddd];\n"
+               "}");
+}
+
 } // end namespace
 } // end namespace format
 } // end namespace clang