From 9a4fe8eb7e3242cbca2aa430eb7200e0ad6d0001 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Wed, 10 Jan 2018 15:17:27 -0800
Subject: [PATCH] Rename getPackageNameFromAtTypesDirectoryWithoutPrefix to
 getUnmangledNameForScopedPackage

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

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 532d076504b..018bddd420b 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -1097,16 +1097,16 @@ namespace ts {
     export function getPackageNameFromAtTypesDirectory(mangledName: string): string {
         const withoutAtTypePrefix = removePrefix(mangledName, "@types/");
         if (withoutAtTypePrefix !== mangledName) {
-            return getPackageNameFromAtTypesDirectoryWithoutPrefix(withoutAtTypePrefix);
+            return getUnmangledNameForScopedPackage(withoutAtTypePrefix);
         }
         return mangledName;
     }
 
     /* @internal */
-    export function getPackageNameFromAtTypesDirectoryWithoutPrefix(withoutAtTypePrefix: string): string {
-        return stringContains(withoutAtTypePrefix, mangledScopedPackageSeparator) ?
-            "@" + withoutAtTypePrefix.replace(mangledScopedPackageSeparator, ts.directorySeparator) :
-            withoutAtTypePrefix;
+    export function getUnmangledNameForScopedPackage(typesPackageName: string): string {
+        return stringContains(typesPackageName, mangledScopedPackageSeparator) ?
+            "@" + typesPackageName.replace(mangledScopedPackageSeparator, ts.directorySeparator) :
+            typesPackageName;
     }
 
     function tryFindNonRelativeModuleNameInCache(cache: PerModuleNameCache | undefined, moduleName: string, containingDirectory: string, traceEnabled: boolean, host: ModuleResolutionHost): SearchResult<Resolved> {
diff --git a/src/services/pathCompletions.ts b/src/services/pathCompletions.ts
index 9ed612f0ef3..82f144ac377 100644
--- a/src/services/pathCompletions.ts
+++ b/src/services/pathCompletions.ts
@@ -315,7 +315,7 @@ namespace ts.Completions.PathCompletions {
         const seen = createMap<true>();
         if (options.types) {
             for (const typesName of options.types) {
-                const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(typesName);
+                const moduleName = getUnmangledNameForScopedPackage(typesName);
                 pushResult(moduleName);
             }
         }
@@ -349,7 +349,7 @@ namespace ts.Completions.PathCompletions {
                     for (let typeDirectory of directories) {
                         typeDirectory = normalizePath(typeDirectory);
                         const directoryName = getBaseFileName(typeDirectory);
-                        const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(directoryName);
+                        const moduleName = getUnmangledNameForScopedPackage(directoryName);
                         pushResult(moduleName);
                     }
                 }