From db09a593d3e4d50cf6a218192a417bc9b7ebc761 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Tue, 9 Jan 2018 15:40:32 -0800
Subject: [PATCH] Unmangle package names from typings during completion

---
 src/compiler/moduleNameResolver.ts | 11 ++++++++---
 src/services/pathCompletions.ts    |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 1cc11acd32d..532d076504b 100644
--- 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
index 584a83ad95c..f6f6667bbec 100644
--- 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));
                     }
                 }
             }