Skip to content

Commit e8c7aee

Browse files
committed
Fix tests
1 parent 49388d7 commit e8c7aee

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function formatExtensions(extensions: Extensions) {
194194
if (extensions & Extensions.JavaScript) result.push("JavaScript");
195195
if (extensions & Extensions.Declaration) result.push("Declaration");
196196
if (extensions & Extensions.Json) result.push("JSON");
197-
if (extensions & Extensions.Any) result.push("Any");
197+
if (extensions === Extensions.Any) result.push("Any");
198198
return result.join(", ");
199199
}
200200

@@ -2170,7 +2170,7 @@ function tryAddingExtensions(candidate: string, extensions: Extensions, original
21702170
|| undefined;
21712171
default:
21722172
return extensions & Extensions.Declaration && !isDeclarationFileName(candidate + originalExtension) && tryExtension(`.d${originalExtension}.ts`)
2173-
|| extensions & Extensions.Any && tryExtension(originalExtension)
2173+
|| extensions === Extensions.Any && tryExtension(originalExtension)
21742174
|| undefined;
21752175
}
21762176

@@ -2606,7 +2606,7 @@ function loadModuleFromSelfNameReference(extensions: Extensions, moduleName: str
26062606
return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
26072607
}
26082608
const priorityExtensions = extensions & (Extensions.TypeScript | Extensions.Declaration);
2609-
const secondaryExtensions = extensions & ~(Extensions.TypeScript | Extensions.Declaration);
2609+
const secondaryExtensions = extensions === Extensions.Any ? Extensions.Any : extensions & ~(Extensions.TypeScript | Extensions.Declaration);
26102610
return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference)
26112611
|| loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
26122612
}
@@ -3005,7 +3005,7 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions: Extensions,
30053005
// 2. For each ancestor node_modules directory, try to find:
30063006
// i. JS files in the implementation package
30073007
const priorityExtensions = extensions & (Extensions.TypeScript | Extensions.Declaration);
3008-
const secondaryExtensions = extensions & ~(Extensions.TypeScript | Extensions.Declaration);
3008+
const secondaryExtensions = extensions === Extensions.Any ? Extensions.Any : extensions & ~(Extensions.TypeScript | Extensions.Declaration);
30093009
// (1)
30103010
if (priorityExtensions) {
30113011
traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0, formatExtensions(priorityExtensions));

0 commit comments

Comments
 (0)