Unmangle package names from typings during completion

amcasey · amcasey · commit db09a593d3e4 · 2018-01-09T16:45:42.000-08:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -1097,13 +1097,18 @@ namespace ts {
     export function getPackageNameFromAtTypesDirectory(mangledName: string): string {
         const withoutAtTypePrefix = removePrefix(mangledName, "@types/");
         if (withoutAtTypePrefix !== mangledName) {
-            return stringContains(withoutAtTypePrefix, mangledScopedPackageSeparator) ?
-                "@" + withoutAtTypePrefix.replace(mangledScopedPackageSeparator, ts.directorySeparator) :
-                withoutAtTypePrefix;
+            return getPackageNameFromAtTypesDirectoryWithoutPrefix(withoutAtTypePrefix);
         }
         return mangledName;
     }
 
+    /* @internal */
+    export function getPackageNameFromAtTypesDirectoryWithoutPrefix(withoutAtTypePrefix: string): string {
+        return stringContains(withoutAtTypePrefix, mangledScopedPackageSeparator) ?
+            "@" + withoutAtTypePrefix.replace(mangledScopedPackageSeparator, ts.directorySeparator) :
+            withoutAtTypePrefix;
+    }
+
     function tryFindNonRelativeModuleNameInCache(cache: PerModuleNameCache | undefined, moduleName: string, containingDirectory: string, traceEnabled: boolean, host: ModuleResolutionHost): SearchResult<Resolved> {
         const result = cache && cache.get(containingDirectory);
         if (result) {
diff --git a/src/services/pathCompletions.ts b/src/services/pathCompletions.ts
@@ -313,7 +313,8 @@ namespace ts.Completions.PathCompletions {
     function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, span: TextSpan, result: CompletionEntry[] = []): CompletionEntry[] {
         // Check for typings specified in compiler options
         if (options.types) {
-            for (const moduleName of options.types) {
+            for (const typesName of options.types) {
+                const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(typesName);
                 result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
             }
         }
@@ -346,7 +347,9 @@ namespace ts.Completions.PathCompletions {
                 if (directories) {
                     for (let typeDirectory of directories) {
                         typeDirectory = normalizePath(typeDirectory);
-                        result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));
+                        const directoryName = getBaseFileName(typeDirectory);
+                        const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(directoryName);
+                        result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,8 @@ namespace ts.Completions.PathCompletions {`
`313`	`313`	`function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, span: TextSpan, result: CompletionEntry[] = []): CompletionEntry[] {`
`314`	`314`	`// Check for typings specified in compiler options`
`315`	`315`	`if (options.types) {`
`316`		`- for (const moduleName of options.types) {`
	`316`	`+ for (const typesName of options.types) {`
	`317`	`+ const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(typesName);`
`317`	`318`	`result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));`
`318`	`319`	`}`
`319`	`320`	`}`
`@@ -346,7 +347,9 @@ namespace ts.Completions.PathCompletions {`
`346`	`347`	`if (directories) {`
`347`	`348`	`for (let typeDirectory of directories) {`
`348`	`349`	`typeDirectory = normalizePath(typeDirectory);`
`349`		`- result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));`
	`350`	`+ const directoryName = getBaseFileName(typeDirectory);`
	`351`	`+ const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(directoryName);`
	`352`	`+ result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));`
`350`	`353`	`}`
`351`	`354`	`}`
`352`	`355`	`}`