Code fix for missing imports

src/compiler/checker.ts

@@ -102,7 +102,8 @@ namespace ts {
             isImplementationOfOverload,
             getAliasedSymbol: resolveAlias,
             getEmitResolver,
-            getExportsOfModule: getExportsOfModuleAsArray,
+            getExportsOfModuleAsArray,
+            getExportsOfModule,
             getAmbientModules,
 
             getJsxElementAttributesType,

src/compiler/core.ts

@@ -1369,6 +1369,14 @@ namespace ts {
             getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
     }
 
+    export function getEmitModuleResolutionKind(compilerOptions: CompilerOptions) {
+        let moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
+        }
+        return moduleResolution;
+    }
+
     /* @internal */
     export function hasZeroOrOneAsteriskCharacter(str: string): boolean {
         let seenAsterisk = false;

src/compiler/diagnosticMessages.json

@@ -3162,5 +3162,17 @@
     "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
         "category": "Error",
         "code": 90009
+    },
+    "Import {0} from {1}": {
+        "category": "Message",
+        "code": 90010
+    },
+    "Change {0} to {1}": {
+        "category": "Message",
+        "code": 90011
+    },
+    "Add {0} to existing import declaration from {1}": {
+        "category": "Message",
+        "code": 90012
     }
 }

src/compiler/moduleNameResolver.ts

@@ -56,7 +56,7 @@ namespace ts {
         return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations };
     }
 
-    function moduleHasNonRelativeName(moduleName: string): boolean {
+    export function moduleHasNonRelativeName(moduleName: string): boolean {
         return !(isRootedDiskPath(moduleName) || isExternalModuleNameRelative(moduleName));
     }
 

src/compiler/types.ts

@@ -2291,7 +2291,8 @@ namespace ts {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean;
         getAliasedSymbol(symbol: Symbol): Symbol;
-        getExportsOfModule(moduleSymbol: Symbol): Symbol[];
+        getExportsOfModuleAsArray(moduleSymbol: Symbol): Symbol[];
+        getExportsOfModule(moduleSymbol: Symbol): Map<Symbol> | undefined;
 
         getJsxElementAttributesType(elementNode: JsxOpeningLikeElement): Type;
         getJsxIntrinsicTagNames(): Symbol[];
@@ -3097,7 +3098,7 @@ namespace ts {
         target?: ScriptTarget;
         traceResolution?: boolean;
         types?: string[];
-        /** Paths used to used to compute primary types search locations */
+        /** Paths used to compute primary types search locations */
         typeRoots?: string[];
         /*@internal*/ version?: boolean;
         /*@internal*/ watch?: boolean;

src/harness/fourslash.ts

@@ -2602,7 +2602,7 @@ ${code}
                                 resetLocalData();
                             }
 
-                            currentFileName = basePath + "/" + value;
+                            currentFileName = ts.isRootedDiskPath(value) ? value : basePath + "/" + value;
                             currentFileOptions[key] = value;
                         }
                         else {

src/services/codefixes/codeFixProvider.ts

@@ -1,4 +1,4 @@
-/* @internal */
+/* @internal */
 namespace ts {
     export interface CodeFix {
         errorCodes: number[];
@@ -11,6 +11,8 @@ namespace ts {
         span: TextSpan;
         program: Program;
         newLineCharacter: string;
+        host: LanguageServiceHost;
+        cancellationToken: CancellationToken;
     }
 
     export namespace codefix {

src/services/codefixes/fixes.ts

@@ -1 +1,2 @@
 ///<reference path='superFixes.ts' />
+///<reference path='importFixes.ts' />

src/services/completions.ts

@@ -975,7 +975,7 @@ namespace ts.Completions {
 
                 if (symbol && symbol.flags & SymbolFlags.HasExports) {
                     // Extract module or enum members
-                    const exportedSymbols = typeChecker.getExportsOfModule(symbol);
+                    const exportedSymbols = typeChecker.getExportsOfModuleAsArray(symbol);
                     forEach(exportedSymbols, symbol => {
                         if (typeChecker.isValidPropertyAccess(<PropertyAccessExpression>(node.parent), symbol.name)) {
                             symbols.push(symbol);
@@ -1320,7 +1320,7 @@ namespace ts.Completions {
             let exports: Symbol[];
             const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier);
             if (moduleSpecifierSymbol) {
-                exports = typeChecker.getExportsOfModule(moduleSpecifierSymbol);
+                exports = typeChecker.getExportsOfModuleAsArray(moduleSpecifierSymbol);
             }
 
             symbols = exports ? filterNamedImportOrExportCompletionItems(exports, namedImportsOrExports.elements) : emptyArray;

src/services/services.ts

@@ -1,4 +1,4 @@
-/// <reference path="..\compiler\program.ts"/>
+/// <reference path="..\compiler\program.ts"/>
 /// <reference path="..\compiler\commandLineParser.ts"/>
 
 /// <reference path='types.ts' />
@@ -1676,7 +1676,9 @@ namespace ts {
                     sourceFile: sourceFile,
                     span: span,
                     program: program,
-                    newLineCharacter: newLineChar
+                    newLineCharacter: newLineChar,
+                    host: host,
+                    cancellationToken: cancellationToken
                 };
 
                 const fixes = codefix.getFixes(context);

tests/cases/fourslash/importNameCodeFixExistingImport0.ts

@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{ v1 }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.codeFixAtPosition(`{ v1, f1 }`);

tests/cases/fourslash/importNameCodeFixExistingImport1.ts

@@ -0,0 +1,11 @@
+/// <reference path="fourslash.ts" />
+
+//// import d, [|{ v1 }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export default var d1 = 6;
+
+verify.codeFixAtPosition(`{ v1, f1 }`);

tests/cases/fourslash/importNameCodeFixExistingImport10.ts

@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{
+////    v1,
+////    v2
+//// }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.codeFixAtPosition(
+`{
+    v1,
+    v2,
+    f1
+ }`
+);

tests/cases/fourslash/importNameCodeFixExistingImport11.ts

@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{
+////    v1, v2,
+////    v3
+//// }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.codeFixAtPosition(
+`{
+    v1, v2,
+    v3, f1
+ }`
+);

tests/cases/fourslash/importNameCodeFixExistingImport12.ts

@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{}|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.codeFixAtPosition(`{ f1 }`);

tests/cases/fourslash/importNameCodeFixExistingImport2.ts

@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts" />
+
+//// import * as ns from "./module";
+//// [|f1|]/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.codeFixAtPosition(`ns.f1`);

tests/cases/fourslash/importNameCodeFixExistingImport3.ts

@@ -0,0 +1,11 @@
+/// <reference path="fourslash.ts" />
+
+//// import d, * as ns from "./module";
+//// [|f1|]/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export default var d1 = 6;
+
+verify.codeFixAtPosition(`ns.f1`);

tests/cases/fourslash/importNameCodeFixExistingImport4.ts

@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import d from "./module";
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export default var d1 = 6;
+
+verify.codeFixAtPosition(`import d from "./module";
+import { f1 } from "./module";
+f1();`);

tests/cases/fourslash/importNameCodeFixExistingImport5.ts

@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import "./module";
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.codeFixAtPosition(`import "./module";
+import { f1 } from "./module";
+f1();`);

tests/cases/fourslash/importNameCodeFixExistingImport6.ts

@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{ v1 }|] from "fake-module";
+//// f1/*0*/();
+
+// @Filename: ../package.json
+//// { "dependencies": { "fake-module": "latest" } }
+
+// @Filename: ../node_modules/fake-module/index.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.codeFixAtPosition(`{ v1, f1 }`);

tests/cases/fourslash/importNameCodeFixExistingImport7.ts

@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{ v1 }|] from "../other_dir/module";
+//// f1/*0*/();
+
+// @Filename: ../other_dir/module.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.codeFixAtPosition(`{ v1, f1 }`);

tests/cases/fourslash/importNameCodeFixExistingImport8.ts

@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{v1, v2, v3,}|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.codeFixAtPosition(`{v1, v2, v3, f1,}`);

tests/cases/fourslash/importNameCodeFixExistingImport9.ts

@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{
+////    v1
+//// }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.codeFixAtPosition(
+`{
+    v1,
+    f1
+ }`
+);

tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts

@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+verify.codeFixAtPosition(
+`import { f1 } from "ambient-module";
+f1();`
+);

tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts

@@ -0,0 +1,28 @@
+/// <reference path="fourslash.ts" />
+
+//// import d from "other-ambient-module";
+//// [|import * as ns from "yet-another-ambient-module";
+//// var x = v1/*0*/ + 5;|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+// @Filename: otherAmbientModule.ts
+//// declare module "other-ambient-module" {
+////    export default function f2();
+//// }
+
+// @Filename: yetAnotherAmbientModule.ts
+//// declare module "yet-another-ambient-module" {
+////    export function f3();
+////    export var v3;
+//// }
+
+verify.codeFixAtPosition(
+`import * as ns from "yet-another-ambient-module";
+import { v1 } from "ambient-module";
+var x = v1 + 5;`
+);

tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts

@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+//// [|/*
+////  * I'm a license or something
+////  */
+//// f1/*0*/();|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+verify.codeFixAtPosition(
+`/*
+* I'm a license or something
+*/
+import { f1 } from "ambient-module";
+f1();`
+);