Merge pull request microsoft#19578 from amcasey/GH19395

amcasey · web-flow · commit a89c055a48fa · 2017-10-30T16:35:20.000-07:00
Don't pass synthesized node to typeToTypeNode
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2444,18 +2444,21 @@ namespace ts {
         function createNodeBuilder() {
             return {
                 typeToTypeNode: (type: Type, enclosingDeclaration?: Node, flags?: NodeBuilderFlags) => {
+                    Debug.assert(enclosingDeclaration === undefined || (enclosingDeclaration.flags & NodeFlags.Synthesized) === 0);
                     const context = createNodeBuilderContext(enclosingDeclaration, flags);
                     const resultingNode = typeToTypeNodeHelper(type, context);
                     const result = context.encounteredError ? undefined : resultingNode;
                     return result;
                 },
                 indexInfoToIndexSignatureDeclaration: (indexInfo: IndexInfo, kind: IndexKind, enclosingDeclaration?: Node, flags?: NodeBuilderFlags) => {
+                    Debug.assert(enclosingDeclaration === undefined || (enclosingDeclaration.flags & NodeFlags.Synthesized) === 0);
                     const context = createNodeBuilderContext(enclosingDeclaration, flags);
                     const resultingNode = indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context);
                     const result = context.encounteredError ? undefined : resultingNode;
                     return result;
                 },
                 signatureToSignatureDeclaration: (signature: Signature, kind: SyntaxKind, enclosingDeclaration?: Node, flags?: NodeBuilderFlags) => {
+                    Debug.assert(enclosingDeclaration === undefined || (enclosingDeclaration.flags & NodeFlags.Synthesized) === 0);
                     const context = createNodeBuilderContext(enclosingDeclaration, flags);
                     const resultingNode = signatureToSignatureDeclarationHelper(signature, kind, context);
                     const result = context.encounteredError ? undefined : resultingNode;
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
@@ -730,7 +730,7 @@ namespace ts.refactor.extractSymbol {
                 let type = checker.getTypeOfSymbolAtLocation(usage.symbol, usage.node);
                 // Widen the type so we don't emit nonsense annotations like "function fn(x: 3) {"
                 type = checker.getBaseTypeOfLiteralType(type);
-                typeNode = checker.typeToTypeNode(type, node, NodeBuilderFlags.NoTruncation);
+                typeNode = checker.typeToTypeNode(type, scope, NodeBuilderFlags.NoTruncation);
             }
 
             const paramDecl = createParameter(
diff --git a/tests/cases/fourslash/extract-method27.ts b/tests/cases/fourslash/extract-method27.ts
@@ -0,0 +1,34 @@
+/// <reference path='fourslash.ts' />
+
+// Repro https://github.com/Microsoft/TypeScript/issues/19395
+
+// @Filename: test.ts
+//// export const b = 2;
+//// interface Interface { }
+////
+//// async function handle(i: Interface) {
+////     /*a*/const x = 3, y = i;/*b*/
+//// }
+// @Filename: library.d.ts
+//// export as namespace NS;
+//// export const a = 1;
+
+
+goTo.select('a', 'b')
+edit.applyRefactor({
+    refactorName: "Extract Symbol",
+    actionName: "function_scope_1",
+    actionDescription: "Extract to function in module scope",
+    newContent:
+`export const b = 2;
+interface Interface { }
+
+async function handle(i: Interface) {
+    /*RENAME*/newFunction(i);
+}
+
+function newFunction(i: Interface) {
+    const x = 3, y = i;
+}
+`
+});

Original file line number	Diff line number	Diff line change
`@@ -730,7 +730,7 @@ namespace ts.refactor.extractSymbol {`
`730`	`730`	`let type = checker.getTypeOfSymbolAtLocation(usage.symbol, usage.node);`
`731`	`731`	`// Widen the type so we don't emit nonsense annotations like "function fn(x: 3) {"`
`732`	`732`	`type = checker.getBaseTypeOfLiteralType(type);`
`733`		`- typeNode = checker.typeToTypeNode(type, node, NodeBuilderFlags.NoTruncation);`
	`733`	`+ typeNode = checker.typeToTypeNode(type, scope, NodeBuilderFlags.NoTruncation);`
`734`	`734`	`}`
`735`	`735`
`736`	`736`	`const paramDecl = createParameter(`