From b2cbbbd1d37cdb602483f0d6b908b0152c05540e Mon Sep 17 00:00:00 2001 From: Igor Oleinikov Date: Thu, 18 Oct 2018 01:34:04 -0700 Subject: [PATCH] Fix bug in reduceEachChild (fixes #27854) - add reducing of type arguments in tagged template expression --- src/compiler/visitor.ts | 1 + src/testRunner/unittests/transform.ts | 5 ++--- .../reference/transformApi/transformsCorrectly.issue27854.js | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts index 2cfb469f152..fbed806a8ad 100644 --- a/src/compiler/visitor.ts +++ b/src/compiler/visitor.ts @@ -1111,6 +1111,7 @@ namespace ts { case SyntaxKind.TaggedTemplateExpression: result = reduceNode((node).tag, cbNode, result); + result = reduceNodes((node).typeArguments, cbNodes, result); result = reduceNode((node).template, cbNode, result); break; diff --git a/src/testRunner/unittests/transform.ts b/src/testRunner/unittests/transform.ts index 7ed6e9760fd..f219fb6c683 100644 --- a/src/testRunner/unittests/transform.ts +++ b/src/testRunner/unittests/transform.ts @@ -45,9 +45,8 @@ namespace ts { if (isIdentifier(node) && node.text === "oldName") { return createIdentifier("newName"); } - return visitEachChild(node, visitor, context); - } + }; return (node: SourceFile) => visitNode(node, visitor); } @@ -99,7 +98,7 @@ namespace ts { }, compilerOptions: { newLine: NewLineKind.CarriageReturnLineFeed, - target: ts.ScriptTarget.Latest + target: ScriptTarget.Latest } }).outputText; }); diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.issue27854.js b/tests/baselines/reference/transformApi/transformsCorrectly.issue27854.js index 5afec3fccae..d1948143086 100644 --- a/tests/baselines/reference/transformApi/transformsCorrectly.issue27854.js +++ b/tests/baselines/reference/transformApi/transformsCorrectly.issue27854.js @@ -1,3 +1 @@ -newName<{ - a: string; -}> ` ... `; +newName ` ... `;