Rename getPackageNameFromAtTypesDirectoryWithoutPrefix to getUnmangledNameForScopedPackage

amcasey · amcasey · commit 9a4fe8eb7e32 · 2018-01-10T15:17:27.000-08:00
diff --git 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
@@ -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);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ namespace ts.Completions.PathCompletions {`
`315`	`315`	`const seen = createMap<true>();`
`316`	`316`	`if (options.types) {`
`317`	`317`	`for (const typesName of options.types) {`
`318`		`- const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(typesName);`
	`318`	`+ const moduleName = getUnmangledNameForScopedPackage(typesName);`
`319`	`319`	`pushResult(moduleName);`
`320`	`320`	`}`
`321`	`321`	`}`
`@@ -349,7 +349,7 @@ namespace ts.Completions.PathCompletions {`
`349`	`349`	`for (let typeDirectory of directories) {`
`350`	`350`	`typeDirectory = normalizePath(typeDirectory);`
`351`	`351`	`const directoryName = getBaseFileName(typeDirectory);`
`352`		`- const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(directoryName);`
	`352`	`+ const moduleName = getUnmangledNameForScopedPackage(directoryName);`
`353`	`353`	`pushResult(moduleName);`
`354`	`354`	`}`
`355`	`355`	`}`