clang-format: [JS] Fix template string ASI.

[mprobst]

Summary

Previously, automatic semicolon insertion would add an unwrapped line
when a template string contained a line break.

var x = `foo${
    bar}`;

Would be formatted with bar... on a separate line and no indent.

[djasper]

unittests/Format/FormatTestJS.cpp

1280 ↗

(On Diff #74837)

This doesn't look like it has been formatted with clang-format ..

[mprobst]

unittests/Format/FormatTestJS.cpp

1280 ↗

(On Diff #74837)

That is what clang-format does on my machine.

cfe/trunk/lib/Format/UnwrappedLineParser.cpp

void UnwrappedLineParser::readTokenWithJavaScriptASI() {
   bool IsOnSameLine =
       CommentsBeforeNextToken.empty()
           ? Next->NewlinesBefore == 0
           : CommentsBeforeNextToken.front()->NewlinesBefore == 0;
   if (IsOnSameLine)
     return;
 
   bool PreviousMustBeValue = mustBeJSIdentOrValue(Keywords, Previous);
+  bool PreviousStartsTemplateExpr =
+      Previous->is(TT_TemplateString) && Previous->TokenText.endswith("${");
   if (PreviousMustBeValue && Line && Line->Tokens.size() > 1) {
     // If the token before the previous one is an '@', the previous token is an
     // annotation and can precede another identifier/value.
     const FormatToken *PrePrevious = std::prev(Line->Tokens.end(), 2)->Tok;
     if (PrePrevious->is(tok::at))
       return;
   }
   if (Next->is(tok::exclaim) && PreviousMustBeValue)
     addUnwrappedLine();
   bool NextMustBeValue = mustBeJSIdentOrValue(Keywords, Next);
-  if (NextMustBeValue && (PreviousMustBeValue ||
-                          Previous->isOneOf(tok::r_square, tok::r_paren,
-                                            tok::plusplus, tok::minusminus)))
+  bool NextEndsTemplateExpr =
+      Next->is(TT_TemplateString) && Next->TokenText.startswith("}");
+  if (NextMustBeValue && !NextEndsTemplateExpr && !PreviousStartsTemplateExpr &&
+      (PreviousMustBeValue ||
+       Previous->isOneOf(tok::r_square, tok::r_paren, tok::plusplus,
+                         tok::minusminus)))
     addUnwrappedLine();
   if (PreviousMustBeValue && isJSDeclOrStmt(Keywords, Next))
     addUnwrappedLine();
 }
 
 void UnwrappedLineParser::parseStructuralElement() {
   assert(!FormatTok->is(tok::l_brace));
   if (Style.Language == FormatStyle::LK_TableGen &&

cfe/trunk/unittests/Format/FormatTestJS.cpp

TEST_F(FormatTestJS, TemplateStrings) {
   verifyFormat("var x = ` \\` a`;\n"
                "var y;",
                "var x = ` \\` a`;\n"
                "var y;");
   // Escaped dollar.
   verifyFormat("var x = ` \\${foo}`;\n");
 }
 
+TEST_F(FormatTestJS, TemplateStringASI) {
+  verifyFormat("var x = `hello${world}`;", "var x = `hello${\n"
+                                           "    world\n"
+                                           "}`;");
+}
+
 TEST_F(FormatTestJS, NestedTemplateStrings) {
   verifyFormat(
       "var x = `<ul>${xs.map(x => `<li>${x}</li>`).join('\\n')}</ul>`;");
   verifyFormat("var x = `he${({text: 'll'}.text)}o`;");
 
   // Crashed at some point.
   verifyFormat("}");
 }