Port "Restore import defer = parsing"

Co-authored-by: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <[email protected]>

Author: Andarist

internal/parser/parser.go

@@ -2109,11 +2109,21 @@ func (p *Parser) parseImportDeclarationOrImportEqualsDeclaration(pos int, hasJSD
 		if p.isIdentifier() {
 			identifier = p.parseIdentifier()
 		}
-	} else if identifier != nil && identifier.AsIdentifier().Text == "defer" && p.nextToken() != ast.KindFromKeyword {
-		phaseModifier = ast.KindDeferKeyword
-		identifier = nil
-		if p.isIdentifier() {
-			identifier = p.parseIdentifier()
+	} else if identifier != nil && identifier.AsIdentifier().Text == "defer" {
+		var shouldParseAsDeferModifier bool
+		if p.token == ast.KindFromKeyword {
+			shouldParseAsDeferModifier = !p.lookAhead(func(p *Parser) bool {
+				return p.nextTokenIsTokenStringLiteral()
+			})
+		} else {
+			shouldParseAsDeferModifier = p.token != ast.KindCommaToken && p.token != ast.KindEqualsToken
+		}
+		if shouldParseAsDeferModifier {
+			phaseModifier = ast.KindDeferKeyword
+			identifier = nil
+			if p.isIdentifier() {
+				identifier = p.parseIdentifier()
+			}
 		}
 	}
 	if identifier != nil && !p.tokenAfterImportedIdentifierDefinitelyProducesImportDeclaration() && phaseModifier != ast.KindDeferKeyword {

testdata/baselines/reference/submodule/conformance/importBindingDefer.js

@@ -10,4 +10,4 @@ import defer from "./a.js";
 //// [a.js]
 export default 2;
 //// [b.js]
-import "./a.js";
+export {};

testdata/baselines/reference/submodule/conformance/importBindingDefer.js.diff

@@ -5,6 +5,6 @@
 export default 2;
 
 === b.ts ===
-
 import defer from "./a.js";
+>defer : Symbol(defer, Decl(b.ts, 0, 6))
 

testdata/baselines/reference/submodule/conformance/importBindingDefer.symbols

@@ -5,6 +5,6 @@
 export default 2;
 
 === b.ts ===
-
 import defer from "./a.js";
+>defer : 2
 

testdata/baselines/reference/submodule/conformance/importBindingDefer.symbols.diff

@@ -5,6 +5,6 @@
 export default 2;
 
 === b.ts ===
-
 import defer, {} from "./a.js";
+>defer : Symbol(defer, Decl(b.ts, 0, 6))