moveToNewFile: Ignore reference to global (microsoft#24651)

Andy · web-flow · commit 046c5ea6c1c5 · 2018-06-04T10:35:23.000-07:00
diff --git a/src/services/refactors/moveToNewFile.ts b/src/services/refactors/moveToNewFile.ts
@@ -404,7 +404,7 @@ namespace ts.refactor {
                     if (isInImport(decl)) {
                         oldImportsNeededByNewFile.add(symbol);
                     }
-                    else if (isTopLevelDeclaration(decl) && !movedSymbols.has(symbol)) {
+                    else if (isTopLevelDeclaration(decl) && sourceFileOfTopLevelDeclaration(decl) === oldFile && !movedSymbols.has(symbol)) {
                         newFileImportsFromOldFile.add(symbol);
                     }
                 }
@@ -546,7 +546,11 @@ namespace ts.refactor {
     interface TopLevelVariableDeclaration extends VariableDeclaration { parent: VariableDeclarationList & { parent: VariableStatement; }; }
     type TopLevelDeclaration = NonVariableTopLevelDeclaration | TopLevelVariableDeclaration;
     function isTopLevelDeclaration(node: Node): node is TopLevelDeclaration {
-        return isNonVariableTopLevelDeclaration(node) || isVariableDeclaration(node) && isSourceFile(node.parent.parent.parent);
+        return isNonVariableTopLevelDeclaration(node) && isSourceFile(node.parent) || isVariableDeclaration(node) && isSourceFile(node.parent.parent.parent);
+    }
+
+    function sourceFileOfTopLevelDeclaration(node: TopLevelDeclaration): Node {
+        return isVariableDeclaration(node) ? node.parent.parent.parent : node.parent;
     }
 
     function isTopLevelDeclarationStatement(node: Node): node is TopLevelDeclarationStatement {
diff --git a/tests/cases/fourslash/moveToNewFile.ts b/tests/cases/fourslash/moveToNewFile.ts
@@ -4,7 +4,7 @@
 ////import './foo';
 ////import { a, b, alreadyUnused } from './other';
 ////const p = 0;
-////[|const y = p + b;|]
+////[|const y: Date = p + b;|]
 ////a; y;
 
 verify.moveToNewFile({
@@ -20,7 +20,7 @@ a; y;`,
         "/y.ts":
 `import { b } from './other';
 import { p } from './a';
-export const y = p + b;`,
+export const y: Date = p + b;`,
     },
 
     preferences: {

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ namespace ts.refactor {`
`404`	`404`	`if (isInImport(decl)) {`
`405`	`405`	`oldImportsNeededByNewFile.add(symbol);`
`406`	`406`	`}`
`407`		`- else if (isTopLevelDeclaration(decl) && !movedSymbols.has(symbol)) {`
	`407`	`+ else if (isTopLevelDeclaration(decl) && sourceFileOfTopLevelDeclaration(decl) === oldFile && !movedSymbols.has(symbol)) {`
`408`	`408`	`newFileImportsFromOldFile.add(symbol);`
`409`	`409`	`}`
`410`	`410`	`}`
`@@ -546,7 +546,11 @@ namespace ts.refactor {`
`546`	`546`	`interface TopLevelVariableDeclaration extends VariableDeclaration { parent: VariableDeclarationList & { parent: VariableStatement; }; }`
`547`	`547`	`type TopLevelDeclaration = NonVariableTopLevelDeclaration \| TopLevelVariableDeclaration;`
`548`	`548`	`function isTopLevelDeclaration(node: Node): node is TopLevelDeclaration {`
`549`		`- return isNonVariableTopLevelDeclaration(node) \|\| isVariableDeclaration(node) && isSourceFile(node.parent.parent.parent);`
	`549`	`+ return isNonVariableTopLevelDeclaration(node) && isSourceFile(node.parent) \|\| isVariableDeclaration(node) && isSourceFile(node.parent.parent.parent);`
	`550`	`+ }`
	`551`	`+`
	`552`	`+ function sourceFileOfTopLevelDeclaration(node: TopLevelDeclaration): Node {`
	`553`	`+ return isVariableDeclaration(node) ? node.parent.parent.parent : node.parent;`
`550`	`554`	`}`
`551`	`555`
`552`	`556`	`function isTopLevelDeclarationStatement(node: Node): node is TopLevelDeclarationStatement {`