fix #372: precedence of tagged templates

evanw · Sep 8, 2020 · 1be8af4 · 1be8af4
1 parent 4fae626
commit 1be8af4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+* Fix precedence of tagged template expressions ([#372](https://github.com/evanw/esbuild/issues/372))
+
+    Previously `` await tag`text` `` and `` new tag`text` `` were incorrectly parsed as `` (await tag)`text` `` and `` (new tag)`text` ``. They are now correctly parsed as `` await (tag`text`) `` and `` new (tag`text`) `` instead.
+
 ## 0.6.32
 
 * Allow `--format` when bundling is disabled ([#109](https://github.com/evanw/esbuild/issues/109))

diff --git a/internal/parser/parser.go b/internal/parser/parser.go
@@ -2850,9 +2850,6 @@ func (p *parser) parseSuffix(left ast.Expr, level ast.L, errors *deferredErrors,
 			optionalChain = ast.OptionalChainContinue
 
 		case lexer.TNoSubstitutionTemplateLiteral:
-			if level >= ast.LPrefix {
-				return left
-			}
 			p.markSyntaxFeature(compat.TemplateLiteral, p.lexer.Range())
 			head := p.lexer.StringLiteral
 			headRaw := p.lexer.RawTemplateContents()
@@ -2861,9 +2858,6 @@ func (p *parser) parseSuffix(left ast.Expr, level ast.L, errors *deferredErrors,
 			left = ast.Expr{Loc: left.Loc, Data: &ast.ETemplate{Tag: &tag, Head: head, HeadRaw: headRaw}}
 
 		case lexer.TTemplateHead:
-			if level >= ast.LPrefix {
-				return left
-			}
 			p.markSyntaxFeature(compat.TemplateLiteral, p.lexer.Range())
 			head := p.lexer.StringLiteral
 			headRaw := p.lexer.RawTemplateContents()

diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go
@@ -353,6 +353,32 @@ func TestTemplate(t *testing.T) {
 	expectPrinted(t, "let x = `$}y{`", "let x = `$}y{`;\n")
 	expectPrinted(t, "let x = `\\${y}`", "let x = `\\${y}`;\n")
 	expectPrinted(t, "let x = `$\\{y}`", "let x = `\\${y}`;\n")
+
+	expectPrinted(t, "await tag`x`", "await tag`x`;\n")
+	expectPrinted(t, "await (tag`x`)", "await tag`x`;\n")
+	expectPrinted(t, "(await tag)`x`", "(await tag)`x`;\n")
+
+	expectPrinted(t, "await tag`${x}`", "await tag`${x}`;\n")
+	expectPrinted(t, "await (tag`${x}`)", "await tag`${x}`;\n")
+	expectPrinted(t, "(await tag)`${x}`", "(await tag)`${x}`;\n")
+
+	expectPrinted(t, "new tag`x`", "new tag`x`();\n")
+	expectPrinted(t, "new (tag`x`)", "new tag`x`();\n")
+	expectPrinted(t, "new tag()`x`", "new tag()`x`;\n")
+	expectPrinted(t, "(new tag)`x`", "new tag()`x`;\n")
+	expectPrintedMinify(t, "new tag`x`", "new tag`x`;")
+	expectPrintedMinify(t, "new (tag`x`)", "new tag`x`;")
+	expectPrintedMinify(t, "new tag()`x`", "new tag()`x`;")
+	expectPrintedMinify(t, "(new tag)`x`", "new tag()`x`;")
+
+	expectPrinted(t, "new tag`${x}`", "new tag`${x}`();\n")
+	expectPrinted(t, "new (tag`${x}`)", "new tag`${x}`();\n")
+	expectPrinted(t, "new tag()`${x}`", "new tag()`${x}`;\n")
+	expectPrinted(t, "(new tag)`${x}`", "new tag()`${x}`;\n")
+	expectPrintedMinify(t, "new tag`${x}`", "new tag`${x}`;")
+	expectPrintedMinify(t, "new (tag`${x}`)", "new tag`${x}`;")
+	expectPrintedMinify(t, "new tag()`${x}`", "new tag()`${x}`;")
+	expectPrintedMinify(t, "(new tag)`${x}`", "new tag()`${x}`;")
 }
 
 func TestObject(t *testing.T) {