fix(parser): report error on malformed template expressions (#11540)

camc314 · camc314 · commit cb17dae91666 · 2025-06-08T11:46:56.000Z
fixes #11538
diff --git a/crates/oxc_parser/src/js/expression.rs b/crates/oxc_parser/src/js/expression.rs
@@ -471,18 +471,16 @@ impl<'a> ParserImpl<'a> {
                         }
                         Kind::TemplateMiddle => {
                             quasis.push(self.parse_template_element(tagged));
-                        }
-                        Kind::Eof => {
-                            self.expect(Kind::TemplateTail);
-                            break;
-                        }
-                        _ => {
                             // TemplateMiddle Expression[+In, ?Yield, ?Await]
                             let expr =
                                 self.context(Context::In, Context::empty(), Self::parse_expr);
                             expressions.push(expr);
                             self.re_lex_template_substitution_tail();
                         }
+                        _ => {
+                            self.expect(Kind::TemplateTail);
+                            break;
+                        }
                     }
                 }
             }
diff --git a/tasks/coverage/misc/fail/oxc-11538.js b/tasks/coverage/misc/fail/oxc-11538.js
@@ -0,0 +1 @@
+const y = `foo ${x function() {} function () {}}`;
diff --git a/tasks/coverage/snapshots/parser_babel.snap b/tasks/coverage/snapshots/parser_babel.snap
@@ -4459,10 +4459,11 @@ Expect to Parse: tasks/coverage/babel/packages/babel-parser/test/fixtures/typesc
  1 │ `hello ${10 `test`
    ╰────
 
-  × Unexpected token
+  × Expected `}` but found `;`
    ╭─[babel/packages/babel-parser/test/fixtures/es2015/uncategorised/267/input.js:1:12]
  1 │ `hello ${10;test`
-   ·            ─
+   ·            ┬
+   ·            ╰── `}` expected
    ╰────
 
   × Unexpected token
@@ -9516,10 +9517,11 @@ Expect to Parse: tasks/coverage/babel/packages/babel-parser/test/fixtures/typesc
    · ──────
    ╰────
 
-  × Unexpected token
+  × Expected `}` but found `;`
    ╭─[babel/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/unclosed-interpolation/input.js:1:12]
  1 │ `hello ${10;test`
-   ·            ─
+   ·            ┬
+   ·            ╰── `}` expected
    ╰────
 
   × Expected `}` but found `EOF`
diff --git a/tasks/coverage/snapshots/parser_misc.snap b/tasks/coverage/snapshots/parser_misc.snap
@@ -1,7 +1,7 @@
 parser_misc Summary:
 AST Parsed     : 40/40 (100.00%)
 Positive Passed: 40/40 (100.00%)
-Negative Passed: 39/39 (100.00%)
+Negative Passed: 40/40 (100.00%)
 
   × Identifier `b` has already been declared
    ╭─[misc/fail/oxc-10159.js:1:22]
@@ -68,6 +68,13 @@ Negative Passed: 39/39 (100.00%)
  2 │ import defer { x } from "x";
    ╰────
 
+  × Expected `}` but found `function`
+   ╭─[misc/fail/oxc-11538.js:1:20]
+ 1 │ const y = `foo ${x function() {} function () {}}`;
+   ·                    ────┬───
+   ·                        ╰── `}` expected
+   ╰────
+
   × Unexpected token
    ╭─[misc/fail/oxc-169.js:2:1]
  1 │ 1<(V=82<<t-j0<(V=$<LBI<(V=ut<I<(V=$<LBI<(V=uIV=82<<t-j0<(V=$<LBI<(V=ut<I<(V=$<LBI<(V<II>
diff --git a/tasks/coverage/snapshots/parser_typescript.snap b/tasks/coverage/snapshots/parser_typescript.snap
@@ -17766,7 +17766,7 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/salsa/private
    ·                  ─
    ╰────
 
-  × Expected `}` but found `EOF`
+  × Unexpected token
    ╭─[typescript/tests/cases/compiler/taggedTemplatesWithIncompleteTemplateExpressions3.ts:5:23]
  4 │ // Incomplete call, not enough parameters.
  5 │ f `123qdawdrqw${ 1 }${
@@ -17786,13 +17786,13 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/salsa/private
    ·                        ─
    ╰────
 
-  × Expected `}` but found `EOF`
+  × Unexpected token
    ╭─[typescript/tests/cases/compiler/taggedTemplatesWithIncompleteTemplateExpressions5.ts:5:30]
  4 │ // Incomplete call, but too many parameters.
  5 │ f `123qdawdrqw${ 1 }${ 2 }${ 
    ╰────
 
-  × Expected `}` but found `EOF`
+  × Unexpected token
    ╭─[typescript/tests/cases/compiler/taggedTemplatesWithIncompleteTemplateExpressions6.ts:5:23]
  4 │ // Incomplete call, not enough parameters, at EOF.
  5 │ f `123qdawdrqw${ 1 }${

Original file line number	Diff line number	Diff line change
`@@ -471,18 +471,16 @@ impl<'a> ParserImpl<'a> {`
`471`	`471`	`}`
`472`	`472`	`Kind::TemplateMiddle => {`
`473`	`473`	`quasis.push(self.parse_template_element(tagged));`
`474`		`- }`
`475`		`- Kind::Eof => {`
`476`		`- self.expect(Kind::TemplateTail);`
`477`		`- break;`
`478`		`- }`
`479`		`- _ => {`
`480`	`474`	`// TemplateMiddle Expression[+In, ?Yield, ?Await]`
`481`	`475`	`let expr =`
`482`	`476`	`self.context(Context::In, Context::empty(), Self::parse_expr);`
`483`	`477`	`expressions.push(expr);`
`484`	`478`	`self.re_lex_template_substitution_tail();`
`485`	`479`	`}`
	`480`	`+ _ => {`
	`481`	`+ self.expect(Kind::TemplateTail);`
	`482`	`+ break;`
	`483`	`+ }`
`486`	`484`	`}`
`487`	`485`	`}`
`488`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+const y = `foo ${x function() {} function () {}}`;