[clang-format] Fix handling of TypeScript tuples with optional last member

[taymonbeal]

Summary

These were previously incorrectly treated as syntax errors.

[owenpan]

clang/unittests/Format/FormatTestJS.cpp

2827

Can you move it into the OptionalTypes test above?

[taymonbeal]

Merge unit test into existing test

[taymonbeal]

Can anyone please commit this? I don't have commit access. Thanks.

Name: Taymon A. Beal
Email: [e-mail]

[MyDeveloperDay]

Thank you for this LGTM

clang/lib/Format/TokenAnnotator.cpp

case tok::kw_operator:
       if (CurrentToken && CurrentToken->is(tok::l_paren))
         CurrentToken->setType(TT_OverloadedOperatorLParen);
       if (CurrentToken && CurrentToken->Previous->is(TT_BinaryOperator))
         CurrentToken->Previous->setType(TT_OverloadedOperator);
       break;
     case tok::question:
       if (Style.isJavaScript() && Tok->Next &&
           Tok->Next->isOneOf(tok::semi, tok::comma, tok::colon, tok::r_paren,
-                             tok::r_brace)) {
+                             tok::r_brace, tok::r_square)) {
         // Question marks before semicolons, colons, etc. indicate optional
         // types (fields, parameters), e.g.
         //   function(x?: string, y?) {...}
         //   class X { y?; }
         Tok->setType(TT_JsTypeOptionalQuestion);
         break;
       }
       // Declarations cannot be conditional expressions, this can only be part

clang/unittests/Format/FormatTestJS.cpp

verifyFormat("interface X {\n"
                "  y?(): z;\n"
                "}");
   verifyFormat("constructor({aa}: {\n"
                "  aa?: string,\n"
                "  aaaaaaaa?: string,\n"
                "  aaaaaaaaaaaaaaa?: boolean,\n"
                "  aaaaaa?: List<string>\n"
                "}) {}");
+  verifyFormat("type X = [y?];");
 }
 
 TEST_F(FormatTestJS, IndexSignature) {
   verifyFormat("var x: {[k: string]: v};");
 }
 
 TEST_F(FormatTestJS, WrapAfterParen) {
   verifyFormat("xxxxxxxxxxx(\n"
verifyFormat("const letVariable   = 5;\n"
                Style);
 
   verifyFormat("int letVariable   = 5;\n"
                "int constVariable = 10;",
                Style);
 }
 
 } // namespace format
 } // end namespace clang