Skip to content

Commit ab9e0f8

Browse files
committed
moduleNameResolver: fix invalid assertion and avoid unnecessary work
Part of microsoft#18217
1 parent a36a53b commit ab9e0f8

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,6 @@ namespace ts {
362362
}
363363

364364
function getOrCreateCacheForModuleName(nonRelativeModuleName: string): PerModuleNameCache {
365-
if (isExternalModuleNameRelative(nonRelativeModuleName)) {
366-
return undefined!; // TODO: GH#18217
367-
}
368365
let perModuleNameCache = moduleNameToDirectoryMap.get(nonRelativeModuleName);
369366
if (!perModuleNameCache) {
370367
perModuleNameCache = createPerModuleNameCache();
@@ -492,10 +489,9 @@ namespace ts {
492489

493490
if (perFolderCache) {
494491
perFolderCache.set(moduleName, result);
495-
// put result in per-module name cache
496-
const perModuleNameCache = cache!.getOrCreateCacheForModuleName(moduleName);
497-
if (perModuleNameCache) {
498-
perModuleNameCache.set(containingDirectory, result);
492+
if (!isExternalModuleNameRelative(moduleName)) {
493+
// put result in per-module name cache
494+
cache!.getOrCreateCacheForModuleName(moduleName).set(containingDirectory, result);
499495
}
500496
}
501497
}
@@ -1252,9 +1248,9 @@ namespace ts {
12521248
if (resolvedUsingSettings) {
12531249
return { value: resolvedUsingSettings };
12541250
}
1255-
const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
12561251

12571252
if (!isExternalModuleNameRelative(moduleName)) {
1253+
const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
12581254
// Climb up parent directories looking for a module.
12591255
const resolved = forEachAncestorDirectory(containingDirectory, directory => {
12601256
const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);

0 commit comments

Comments
 (0)