maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move indirect call substitution to printer

Browse source
This commit is contained in:
Ron Buckton 2021-04-06 09:45:40 -07:00
parent 3b06ef1a73
commit 13eff9c9fb
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/emitter.ts
View file

@ -2417,8 +2417,26 @@ namespace ts {
emitTokenWithComment(SyntaxKind.CloseBracketToken, node.argumentExpression.end, writePunctuation, node);
}
function maybeEmitIndirectCallPrefix(node: CallExpression | TaggedTemplateExpression) {
const indirect = getEmitFlags(node) & EmitFlags.IndirectCall;
if (indirect) {
writeTokenText(SyntaxKind.OpenParenToken, writePunctuation);
writeLiteral("0");
writeTokenText(SyntaxKind.CommaToken, writePunctuation);
writeSpace();
return true;
}
return false;
}
function emitIndirectCallSuffix() {
writeTokenText(SyntaxKind.CloseParenToken, writePunctuation);
}
function emitCallExpression(node: CallExpression) {
const indirect = maybeEmitIndirectCallPrefix(node);
emit(node.expression);
if (indirect) emitIndirectCallSuffix();
emit(node.questionDotToken);
emitTypeArguments(node, node.typeArguments);
emitList(node, node.arguments, ListFormat.CallExpressionArguments);
@ -2433,7 +2451,9 @@ namespace ts {
}
function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
const indirect = maybeEmitIndirectCallPrefix(node);
emit(node.tag);
if (indirect) emitIndirectCallSuffix();
emitTypeArguments(node, node.typeArguments);
writeSpace();
emit(node.template);

17
src/compiler/transformers/module/module.ts
View file

@ -1813,27 +1813,14 @@ namespace ts {
function substituteCallExpression(node: CallExpression) {
if (isIdentifier(node.expression) && getImportOrExportBindingReference(node.expression, /*removeEntry*/ false)) {
return isCallChain(node) ?
factory.updateCallChain(node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.expression), node.expression),
node.questionDotToken,
/*typeArguments*/ undefined,
node.arguments) :
factory.updateCallExpression(node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.expression), node.expression),
/*typeArguments*/ undefined,
node.arguments);
addEmitFlags(node, EmitFlags.IndirectCall);
}
return node;
}
function substituteTaggedTemplateExpression(node: TaggedTemplateExpression) {
if (isIdentifier(node.tag) && getImportOrExportBindingReference(node.tag, /*removeEntry*/ false)) {
return factory.updateTaggedTemplateExpression(
node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.tag), node.tag),
/*typeArguments*/ undefined,
node.template);
addEmitFlags(node, EmitFlags.IndirectCall);
}
return node;
}

1
src/compiler/types.ts
View file

@ -6624,6 +6624,7 @@ namespace ts {
/*@internal*/ TypeScriptClassWrapper = 1 << 25, // The node is an IIFE class wrapper created by the ts transform.
/*@internal*/ NeverApplyImportHelper = 1 << 26, // Indicates the node should never be wrapped with an import star helper (because, for example, it imports tslib itself)
/*@internal*/ IgnoreSourceNewlines = 1 << 27, // Overrides `printerOptions.preserveSourceNewlines` to print this node (and all descendants) with default whitespace.
/*@internal*/ IndirectCall = 1 << 28, // Write `(0,` before the expression and `)` after the expression of a call to ensure the call is indirect (i.e., no `this` binding)
}
export interface EmitHelperBase {