moveToNewFile: Fix bug for VariableDeclaration missing initializer (microsoft#24214)

Andy · web-flow · commit 09b9ec43e396 · 2018-05-17T12:38:20.000-07:00
diff --git a/src/services/refactors/moveToNewFile.ts b/src/services/refactors/moveToNewFile.ts
@@ -433,7 +433,7 @@ namespace ts.refactor {
     }
     function isVariableDeclarationInImport(decl: VariableDeclaration) {
         return isSourceFile(decl.parent.parent.parent) &&
-            isRequireCall(decl.initializer, /*checkArgumentIsStringLiteralLike*/ true);
+            decl.initializer && isRequireCall(decl.initializer, /*checkArgumentIsStringLiteralLike*/ true);
     }
 
     function filterImport(i: SupportedImport, moduleSpecifier: StringLiteralLike, keep: (name: Identifier) => boolean): SupportedImportStatement | undefined {
diff --git a/tests/cases/fourslash/moveToNewFile_variableDeclarationWithNoInitializer.ts b/tests/cases/fourslash/moveToNewFile_variableDeclarationWithNoInitializer.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: /a.ts
+////export {};
+////let x;
+////[|const y = x;|]
+
+verify.moveToNewFile({
+    newFileContents: {
+        "/a.ts":
+`export {};
+export let x;
+`,
+
+        "/y.ts":
+`import { x } from "./a";
+const y = x;`,
+    },
+});

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ namespace ts.refactor {`
`433`	`433`	`}`
`434`	`434`	`function isVariableDeclarationInImport(decl: VariableDeclaration) {`
`435`	`435`	`return isSourceFile(decl.parent.parent.parent) &&`
`436`		`- isRequireCall(decl.initializer, /checkArgumentIsStringLiteralLike/ true);`
	`436`	`+ decl.initializer && isRequireCall(decl.initializer, /checkArgumentIsStringLiteralLike/ true);`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`function filterImport(i: SupportedImport, moduleSpecifier: StringLiteralLike, keep: (name: Identifier) => boolean): SupportedImportStatement \| undefined {`