not using the generic verify method for import fixes.

zhengbli · zhengbli · commit a282fc012fbd · 2016-11-11T14:13:02.000-08:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -2018,7 +2018,31 @@ namespace FourSlash {
             return this.languageService.getCodeFixesAtPosition(fileName, diagnostic.start, diagnostic.length, [diagnostic.code]);
         }
 
-        public verifyCodeFixAtPosition(expectedTextArray: string[], errorCode?: number) {
+        public verifyCodeFixAtPosition(expectedText: string, errorCode?: number) {
+            const ranges = this.getRanges();
+            if (ranges.length == 0) {
+                this.raiseError("At least one range should be specified in the testfile.");
+            }
+
+            const actual = this.getCodeFixes(errorCode);
+
+            if (!actual || actual.length == 0) {
+                this.raiseError("No codefixes returned.");
+            }
+
+            if (actual.length > 1) {
+                this.raiseError("More than 1 codefix returned.");
+            }
+
+            this.applyEdits(actual[0].changes[0].fileName, actual[0].changes[0].textChanges, /*isFormattingEdit*/ false);
+            const actualText = this.rangeText(ranges[0]);
+
+            if (this.removeWhitespace(actualText) !== this.removeWhitespace(expectedText)) {
+                this.raiseError(`Actual text doesn't match expected text. Actual: '${actualText}' Expected: '${expectedText}'`);
+            }
+        }
+
+        public verifyImportFixAtPosition(expectedTextArray: string[], errorCode?: number) {
             const ranges = this.getRanges();
             if (ranges.length == 0) {
                 this.raiseError("At least one range should be specified in the testfile.");
@@ -2042,7 +2066,7 @@ namespace FourSlash {
             const sortedActualArray = actualTextArray.sort();
             if (!ts.arrayIsEqualTo(sortedExpectedArray, sortedActualArray)) {
                 this.raiseError(
-                    `Actual text array doesn't match expected text array. \nActual: \n'${sortedActualArray.join('\n\n')}'\n---\nExpected: \n'${sortedExpectedArray.join('\n\n')}'`);
+                    `Actual text array doesn't match expected text array. \nActual: \n"${sortedActualArray.join("\n\n")}"\n---\nExpected: \n'${sortedExpectedArray.join("\n\n")}'`);
             }
         }
 
@@ -3299,8 +3323,12 @@ namespace FourSlashInterface {
             this.DocCommentTemplate(/*expectedText*/ undefined, /*expectedOffset*/ undefined, /*empty*/ true);
         }
 
-        public codeFixAtPosition(expectedTextArray: string[], errorCode?: number): void {
-            this.state.verifyCodeFixAtPosition(expectedTextArray, errorCode);
+        public codeFixAtPosition(expectedText: string, errorCode?: number): void {
+            this.state.verifyCodeFixAtPosition(expectedText, errorCode);
+        }
+
+        public importFixAtPosition(expectedTextArray: string[], errorCode?: number): void {
+            this.state.verifyImportFixAtPosition(expectedTextArray, errorCode);
         }
 
         public navigationBar(json: any) {
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -21,7 +21,7 @@ namespace ts.codefix {
 
             const allPotentialModules = checker.getAmbientModules();
             for (const otherSourceFile of allSourceFiles) {
-                if (otherSourceFile !== sourceFile && otherSourceFile.symbol) {
+                if (otherSourceFile !== sourceFile && isExternalOrCommonJsModule(otherSourceFile) && otherSourceFile.symbol) {
                     allPotentialModules.push(otherSourceFile.symbol);
                 }
             }
@@ -203,24 +203,15 @@ namespace ts.codefix {
                         // original text: import { foo, bar } from "module"
                         // change to: import { foo, bar, name } from "module"
                         const insertPoint = importList.elements[importList.elements.length - 1].getEnd();
-                        // If the import list has one import per line, preserve that. Otherwise, insert on same line as last element
-                        let oneImportPerLine: boolean;
-                        if (importList.elements.length === 1) {
-                            /**
-                             * If there is only one symbol being imported, still check to see if it's set up for multi-line imports like this:
-                             *     import {
-                             *         foo
-                             *     } from "./module";
-                             */
-                            const startLine = getLineOfLocalPosition(sourceFile, importList.getStart());
-                            const endLine = getLineOfLocalPosition(sourceFile, importList.getEnd());
-                            oneImportPerLine = endLine - startLine >= 2;
-                        }
-                        else {
-                            const startLine = getLineOfLocalPosition(sourceFile, importList.elements[0].getStart());
-                            const endLine = getLineOfLocalPosition(sourceFile, insertPoint);
-                            oneImportPerLine = endLine - startLine >= importList.elements.length - 1;
-                        }
+                        /**
+                         * If the import list has one import per line, preserve that. Otherwise, insert on same line as last element
+                         *     import {
+                         *         foo
+                         *     } from "./module";
+                         */
+                        const startLine = getLineOfLocalPosition(sourceFile, importList.getStart());
+                        const endLine = getLineOfLocalPosition(sourceFile, importList.getEnd());
+                        const oneImportPerLine = endLine - startLine > importList.elements.length;
 
                         return {
                             newText: `,${oneImportPerLine ? context.newLineCharacter : " "}${newImportText}`,
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -209,7 +209,8 @@ declare namespace FourSlashInterface {
         noMatchingBracePositionInCurrentFile(bracePosition: number): void;
         DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean): void;
         noDocCommentTemplate(): void;
-        codeFixAtPosition(expectedTextArray: string[], errorCode?: number): void;
+        codeFixAtPosition(expectedText: string, errorCode?: number): void;
+        importFixAtPosition(expectedTextArray: string[], errorCode?: number): void;
 
         navigationBar(json: any): void;
         navigationTree(json: any): void;
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport0.ts b/tests/cases/fourslash/importNameCodeFixExistingImport0.ts
@@ -7,4 +7,4 @@
 //// export function f1() {}
 //// export var v1 = 5;
 
-verify.codeFixAtPosition([`{ v1, f1 }`]);
+verify.importFixAtPosition([`{ v1, f1 }`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport1.ts b/tests/cases/fourslash/importNameCodeFixExistingImport1.ts
@@ -8,4 +8,4 @@
 //// export var v1 = 5;
 //// export default var d1 = 6;
 
-verify.codeFixAtPosition([`{ v1, f1 }`]);
+verify.importFixAtPosition([`{ v1, f1 }`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport10.ts b/tests/cases/fourslash/importNameCodeFixExistingImport10.ts
@@ -12,7 +12,7 @@
 //// export var v2 = 5;
 //// export var v3 = 5;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `{
     v1,
     v2,
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport11.ts b/tests/cases/fourslash/importNameCodeFixExistingImport11.ts
@@ -12,7 +12,7 @@
 //// export var v2 = 5;
 //// export var v3 = 5;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `{
     v1, v2,
     v3, f1
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport12.ts b/tests/cases/fourslash/importNameCodeFixExistingImport12.ts
@@ -9,4 +9,4 @@
 //// export var v2 = 5;
 //// export var v3 = 5;
 
-verify.codeFixAtPosition([`{ f1 }`]);
+verify.importFixAtPosition([`{ f1 }`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport2.ts b/tests/cases/fourslash/importNameCodeFixExistingImport2.ts
@@ -7,7 +7,7 @@
 //// export function f1() {}
 //// export var v1 = 5;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import * as ns from "./module";
 import { f1 } from "./module";
 f1();`,
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport3.ts b/tests/cases/fourslash/importNameCodeFixExistingImport3.ts
@@ -8,7 +8,7 @@
 //// export var v1 = 5;
 //// export default var d1 = 6;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import d, * as ns from "./module";
 ns.f1();`,
 `import d, * as ns from "./module";
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport4.ts b/tests/cases/fourslash/importNameCodeFixExistingImport4.ts
@@ -8,7 +8,7 @@
 //// export var v1 = 5;
 //// export default var d1 = 6;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import d, { f1 } from "./module";
 f1();`
 ]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport5.ts b/tests/cases/fourslash/importNameCodeFixExistingImport5.ts
@@ -7,6 +7,6 @@
 //// export function f1() {}
 //// export var v1 = 5;
 
-verify.codeFixAtPosition([`import "./module";
+verify.importFixAtPosition([`import "./module";
 import { f1 } from "./module";
 f1();`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport6.ts b/tests/cases/fourslash/importNameCodeFixExistingImport6.ts
@@ -10,4 +10,4 @@
 //// export var v1 = 5;
 //// export function f1();
 
-verify.codeFixAtPosition([`{ v1, f1 }`]);
+verify.importFixAtPosition([`{ v1, f1 }`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport7.ts b/tests/cases/fourslash/importNameCodeFixExistingImport7.ts
@@ -7,4 +7,4 @@
 //// export var v1 = 5;
 //// export function f1();
 
-verify.codeFixAtPosition([`{ v1, f1 }`]);
+verify.importFixAtPosition([`{ v1, f1 }`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport8.ts b/tests/cases/fourslash/importNameCodeFixExistingImport8.ts
@@ -9,4 +9,4 @@
 //// export var v2 = 5;
 //// export var v3 = 5;
 
-verify.codeFixAtPosition([`{v1, v2, v3, f1,}`]);
+verify.importFixAtPosition([`{v1, v2, v3, f1,}`]);
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport9.ts b/tests/cases/fourslash/importNameCodeFixExistingImport9.ts
@@ -9,7 +9,7 @@
 //// export function f1() {}
 //// export var v1 = 5;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `{
     v1,
 f1
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts
@@ -8,7 +8,7 @@
 ////    export var v1;
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "ambient-module";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts
@@ -21,7 +21,7 @@
 ////    export var v3;
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import * as ns from "yet-another-ambient-module";
 import { v1 } from "ambient-module";
 var x = v1 + 5;`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts
@@ -11,7 +11,7 @@
 ////    export var v1;
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `/*
  * I'm a license or something
  */
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient3.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient3.ts
@@ -22,7 +22,7 @@
 ////    export var v3;
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import * as ns from "yet-another-ambient-module";
 import { v1 } from "ambient-module";
 var x = v1 + 5;`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportBaseUrl0.ts b/tests/cases/fourslash/importNameCodeFixNewImportBaseUrl0.ts
@@ -12,7 +12,7 @@
 // @Filename: a/b.ts
 //// export function f1() { };
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "b";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportDefault0.ts b/tests/cases/fourslash/importNameCodeFixNewImportDefault0.ts
@@ -5,7 +5,7 @@
 // @Filename: module.ts
 //// export default function f1() { };
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import f1 from "./module";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile0.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile0.ts
@@ -6,7 +6,7 @@
 //// export function f1() {}
 //// export var v1 = 5;
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "./module";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
@@ -10,7 +10,7 @@
 // @Filename: tripleSlashReference.ts
 //// var x = 5;/*dummy*/
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `/// <reference path="./tripleSlashReference.ts" />
 import { f1 } from "./module";
 
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile2.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile2.ts
@@ -6,7 +6,7 @@
 //// export var v1 = 5;
 //// export function f1();
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "../../other_dir/module";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules0.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules0.ts
@@ -12,7 +12,7 @@
 // @Filename: ../node_modules/fake-module/package.json
 //// {}
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "fake-module";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules1.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules1.ts
@@ -9,7 +9,7 @@
 //// export var v1 = 5;
 //// export function f1();
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "fake-module/nested";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules2.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules2.ts
@@ -18,7 +18,7 @@
 // @Filename: ../node_modules/fake-module/package.json
 //// { "main":"./notindex.js", "typings":"./notindex.d.ts" }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "fake-module";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules3.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules3.ts
@@ -7,7 +7,7 @@
 //// export var v1 = 5;
 //// export function f1();
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { f1 } from "random";
 
 f1();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportPaths0.ts b/tests/cases/fourslash/importNameCodeFixNewImportPaths0.ts
@@ -15,7 +15,7 @@
 ////     }
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { foo } from "a";
 
 foo();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportPaths1.ts b/tests/cases/fourslash/importNameCodeFixNewImportPaths1.ts
@@ -15,7 +15,7 @@
 ////     }
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { foo } from "b/f2";
 
 foo();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportRootDirs0.ts b/tests/cases/fourslash/importNameCodeFixNewImportRootDirs0.ts
@@ -16,7 +16,7 @@
 ////     }
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { foo } from "./f2";
 
 foo();`
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportTypeRoots0.ts b/tests/cases/fourslash/importNameCodeFixNewImportTypeRoots0.ts
@@ -15,7 +15,7 @@
 ////     }
 //// }
 
-verify.codeFixAtPosition([
+verify.importFixAtPosition([
 `import { foo } from "random";
 
 foo();`
diff --git a/tests/cases/fourslash/server/codefix.ts b/tests/cases/fourslash/server/codefix.ts
@@ -7,4 +7,4 @@
 ////    }
 ////}
 
-verify.codeFixAtPosition(['super();']);
+verify.codeFixAtPosition('super();');
diff --git a/tests/cases/fourslash/superFix1.ts b/tests/cases/fourslash/superFix1.ts
@@ -7,4 +7,4 @@
 ////    }
 ////}
 
-verify.codeFixAtPosition(['super();']);
+verify.codeFixAtPosition('super();');
diff --git a/tests/cases/fourslash/superFix2.ts b/tests/cases/fourslash/superFix2.ts
@@ -10,4 +10,4 @@
 ////    }
 ////}
 
-verify.codeFixAtPosition(["super(); this.a = 12;"]);
+verify.codeFixAtPosition("super(); this.a = 12;");
