clang-format: [JS] Handle keyword-named methods.

[mprobst]

Summary

Including do, for, and while, in addition to the previously
handled fields. The unit test explicitly uses methods, but this code
path handles both fields and methods.

[krasimir]

How about if and try? Is there a list somewhere for all such valid identifiers?

[MyDeveloperDay]

LGTM thanks for the patch

[mprobst]

In D72827#1823895, @krasimir wrote:

How about if and try? Is there a list somewhere for all such valid identifiers?

This is a bit annoying - generally speaking, we should parse all keywords in declaration locations as simple names. However UnwrappedLineParser isn't really structured to support that, nor is it precise enough to reliably detect these situations :-/ So I think the best we can do is incrementally detect these issues and fix as they come up.

[mprobst]

I've added tests and a fix for try/catch and if/else.

clang/lib/Format/UnwrappedLineParser.cpp

void UnwrappedLineParser::parseStructuralElement() {
   case tok::kw_private:
     if (Style.Language == FormatStyle::LK_Java ||
         Style.Language == FormatStyle::LK_JavaScript || Style.isCSharp())
       nextToken();
     else
       parseAccessSpecifier();
     return;
   case tok::kw_if:
+    if (Style.Language == FormatStyle::LK_JavaScript && Line->MustBeDeclaration)
+      // field/method declaration.
+      break;
     parseIfThenElse();
     return;
   case tok::kw_for:
   case tok::kw_while:
+    if (Style.Language == FormatStyle::LK_JavaScript && Line->MustBeDeclaration)
+      // field/method declaration.
+      break;
     parseForOrWhileLoop();
     return;
   case tok::kw_do:
+    if (Style.Language == FormatStyle::LK_JavaScript && Line->MustBeDeclaration)
+      // field/method declaration.
+      break;
     parseDoWhile();
     return;
   case tok::kw_switch:
     if (Style.Language == FormatStyle::LK_JavaScript && Line->MustBeDeclaration)
       // 'switch: string' field declaration.
       break;
     parseSwitch();
     return;
void UnwrappedLineParser::parseStructuralElement() {
   case tok::kw_case:
     if (Style.Language == FormatStyle::LK_JavaScript && Line->MustBeDeclaration)
       // 'case: string' field declaration.
       break;
     parseCaseLabel();
     return;
   case tok::kw_try:
   case tok::kw___try:
+    if (Style.Language == FormatStyle::LK_JavaScript && Line->MustBeDeclaration)
+      // field/method declaration.
+      break;
     parseTryCatch();
     return;
   case tok::kw_extern:
     nextToken();
     if (FormatTok->Tok.is(tok::string_literal)) {
       nextToken();
       if (FormatTok->Tok.is(tok::l_brace)) {
         if (Style.BraceWrapping.AfterExternBlock) {
case tok::l_brace:
         parseBlock(/*MustBeDeclaration=*/false);
         addUnwrappedLine();
         return;
       }
       // Otherwise this was a braced init list, and the structural
       // element continues.
       break;
     case tok::kw_try:
+      if (Style.Language == FormatStyle::LK_JavaScript &&
+          Line->MustBeDeclaration) {
+        // field/method declaration.
+        nextToken();
+        break;
+      }
       // We arrive here when parsing function-try blocks.
       if (Style.BraceWrapping.AfterFunction)
         addUnwrappedLine();
       parseTryCatch();
       return;
     case tok::identifier: {
       if (FormatTok->is(TT_MacroBlockEnd)) {
         addUnwrappedLine();

clang/unittests/Format/FormatTestJS.cpp

verifyFormat(
       "  }\n"
       "  interface() {\n"
       "    x();\n"
       "  }\n"
       "  let() {\n"
       "    x();\n"
       "  }\n"
       "}\n");
+  verifyFormat("class KeywordNamedMethods {\n"
+               "  do() {\n"
+               "  }\n"
+               "  for() {\n"
+               "  }\n"
+               "  while() {\n"
+               "  }\n"
+               "  if() {\n"
+               "  }\n"
+               "  else() {\n"
+               "  }\n"
+               "  try() {\n"
+               "  }\n"
+               "  catch() {\n"
+               "  }\n"
+               "}\n");
 }
 
 TEST_F(FormatTestJS, ReservedWordsParenthesized) {
   // All of these are statements using the keyword, not function calls.
   verifyFormat("throw (x + y);\n"
                "await (await x).y;\n"
                "typeof (x) === 'string';\n"
                "void (0);\n"