Skip to content

Commit 1841afe

Browse files
Ensure that the import helper is checked for tagged templates, and update its name.
1 parent 886a29b commit 1841afe

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/compiler/checker.ts

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16665,7 +16665,7 @@ namespace ts {
1666516665

1666616666
function checkTaggedTemplateExpression(node: TaggedTemplateExpression): Type {
1666716667
if (languageVersion < ScriptTarget.ES2015) {
16668-
checkExternalEmitHelpers(node, ExternalEmitHelpers.GetTemplateObject);
16668+
checkExternalEmitHelpers(node, ExternalEmitHelpers.MakeTemplateObject);
1666916669
}
1667016670
return getReturnTypeOfSignature(getResolvedSignature(node));
1667116671
}
@@ -24032,7 +24032,7 @@ namespace ts {
2403224032
case ExternalEmitHelpers.AsyncDelegator: return "__asyncDelegator";
2403324033
case ExternalEmitHelpers.AsyncValues: return "__asyncValues";
2403424034
case ExternalEmitHelpers.ExportStar: return "__exportStar";
24035-
case ExternalEmitHelpers.GetTemplateObject: return "__getTemplateObject";
24035+
case ExternalEmitHelpers.MakeTemplateObject: return "__makeTemplateObject";
2403624036
default: Debug.fail("Unrecognized helper");
2403724037
}
2403824038
}

src/compiler/types.ts

100644100755
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4287,7 +4287,8 @@ namespace ts {
42874287
AsyncDelegator = 1 << 13, // __asyncDelegator (used by ES2017 async generator yield* transformation)
42884288
AsyncValues = 1 << 14, // __asyncValues (used by ES2017 for..await..of transformation)
42894289
ExportStar = 1 << 15, // __exportStar (used by CommonJS/AMD/UMD module transformation)
4290-
GetTemplateObject = 1 << 16, // __getTemplateObject (used for constructing template string array objects)
4290+
MakeTemplateObject = 1 << 16, // __makeTemplateObject (used for constructing template string array objects)
4291+
" LastPlusOne",
42914292

42924293
// Helpers included by ES2015 for..of
42934294
ForOfIncludes = Values,
@@ -4305,7 +4306,7 @@ namespace ts {
43054306
SpreadIncludes = Read | Spread,
43064307

43074308
FirstEmitHelper = Extends,
4308-
LastEmitHelper = ExportStar
4309+
LastEmitHelper = ExternalEmitHelpers[" LastPlusOne"] - 1
43094310
}
43104311

43114312
export const enum EmitHint {

0 commit comments

Comments
 (0)