Skip to content

Commit b28e3b0

Browse files
committed
Update LKG
1 parent 4476649 commit b28e3b0

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

lib/tsc.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20230,7 +20230,7 @@ var ts;
2023020230
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
2023120231
return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
2023220232
if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
20233-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
20233+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host, failedLookupLocations);
2023420234
if (resolutionFromCache) {
2023520235
return resolutionFromCache;
2023620236
}
@@ -20297,12 +20297,13 @@ var ts;
2029720297
typesPackageName;
2029820298
}
2029920299
ts.getUnmangledNameForScopedPackage = getUnmangledNameForScopedPackage;
20300-
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host) {
20300+
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host, failedLookupLocations) {
2030120301
var result = cache && cache.get(containingDirectory);
2030220302
if (result) {
2030320303
if (traceEnabled) {
2030420304
trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
2030520305
}
20306+
failedLookupLocations.push.apply(failedLookupLocations, result.failedLookupLocations);
2030620307
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
2030720308
}
2030820309
}
@@ -20321,7 +20322,7 @@ var ts;
2032120322
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
2032220323
if (!ts.isExternalModuleNameRelative(moduleName)) {
2032320324
var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
20324-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
20325+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);
2032520326
if (resolutionFromCache) {
2032620327
return resolutionFromCache;
2032720328
}

lib/tsserver.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6429,7 +6429,7 @@ var ts;
64296429
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
64306430
return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
64316431
if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
6432-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
6432+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host, failedLookupLocations);
64336433
if (resolutionFromCache) {
64346434
return resolutionFromCache;
64356435
}
@@ -6496,12 +6496,13 @@ var ts;
64966496
typesPackageName;
64976497
}
64986498
ts.getUnmangledNameForScopedPackage = getUnmangledNameForScopedPackage;
6499-
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host) {
6499+
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host, failedLookupLocations) {
65006500
var result = cache && cache.get(containingDirectory);
65016501
if (result) {
65026502
if (traceEnabled) {
65036503
trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
65046504
}
6505+
failedLookupLocations.push.apply(failedLookupLocations, result.failedLookupLocations);
65056506
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
65066507
}
65076508
}
@@ -6520,7 +6521,7 @@ var ts;
65206521
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
65216522
if (!ts.isExternalModuleNameRelative(moduleName)) {
65226523
var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
6523-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
6524+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);
65246525
if (resolutionFromCache) {
65256526
return resolutionFromCache;
65266527
}

lib/tsserverlibrary.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23761,7 +23761,7 @@ var ts;
2376123761
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
2376223762
return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
2376323763
if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
23764-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
23764+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host, failedLookupLocations);
2376523765
if (resolutionFromCache) {
2376623766
return resolutionFromCache;
2376723767
}
@@ -23835,12 +23835,13 @@ var ts;
2383523835
typesPackageName;
2383623836
}
2383723837
ts.getUnmangledNameForScopedPackage = getUnmangledNameForScopedPackage;
23838-
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host) {
23838+
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host, failedLookupLocations) {
2383923839
var result = cache && cache.get(containingDirectory);
2384023840
if (result) {
2384123841
if (traceEnabled) {
2384223842
trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
2384323843
}
23844+
failedLookupLocations.push.apply(failedLookupLocations, result.failedLookupLocations);
2384423845
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
2384523846
}
2384623847
}
@@ -23861,7 +23862,7 @@ var ts;
2386123862
if (!ts.isExternalModuleNameRelative(moduleName)) {
2386223863
// Climb up parent directories looking for a module.
2386323864
var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
23864-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
23865+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);
2386523866
if (resolutionFromCache) {
2386623867
return resolutionFromCache;
2386723868
}

lib/typescript.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25210,7 +25210,7 @@ var ts;
2521025210
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
2521125211
return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
2521225212
if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
25213-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
25213+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host, failedLookupLocations);
2521425214
if (resolutionFromCache) {
2521525215
return resolutionFromCache;
2521625216
}
@@ -25284,12 +25284,13 @@ var ts;
2528425284
typesPackageName;
2528525285
}
2528625286
ts.getUnmangledNameForScopedPackage = getUnmangledNameForScopedPackage;
25287-
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host) {
25287+
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host, failedLookupLocations) {
2528825288
var result = cache && cache.get(containingDirectory);
2528925289
if (result) {
2529025290
if (traceEnabled) {
2529125291
trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
2529225292
}
25293+
failedLookupLocations.push.apply(failedLookupLocations, result.failedLookupLocations);
2529325294
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
2529425295
}
2529525296
}
@@ -25310,7 +25311,7 @@ var ts;
2531025311
if (!ts.isExternalModuleNameRelative(moduleName)) {
2531125312
// Climb up parent directories looking for a module.
2531225313
var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
25313-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
25314+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);
2531425315
if (resolutionFromCache) {
2531525316
return resolutionFromCache;
2531625317
}

lib/typescriptServices.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25210,7 +25210,7 @@ var ts;
2521025210
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
2521125211
return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
2521225212
if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
25213-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
25213+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host, failedLookupLocations);
2521425214
if (resolutionFromCache) {
2521525215
return resolutionFromCache;
2521625216
}
@@ -25284,12 +25284,13 @@ var ts;
2528425284
typesPackageName;
2528525285
}
2528625286
ts.getUnmangledNameForScopedPackage = getUnmangledNameForScopedPackage;
25287-
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host) {
25287+
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host, failedLookupLocations) {
2528825288
var result = cache && cache.get(containingDirectory);
2528925289
if (result) {
2529025290
if (traceEnabled) {
2529125291
trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
2529225292
}
25293+
failedLookupLocations.push.apply(failedLookupLocations, result.failedLookupLocations);
2529325294
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
2529425295
}
2529525296
}
@@ -25310,7 +25311,7 @@ var ts;
2531025311
if (!ts.isExternalModuleNameRelative(moduleName)) {
2531125312
// Climb up parent directories looking for a module.
2531225313
var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
25313-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
25314+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);
2531425315
if (resolutionFromCache) {
2531525316
return resolutionFromCache;
2531625317
}

lib/typingsInstaller.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19091,7 +19091,7 @@ var ts;
1909119091
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
1909219092
return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
1909319093
if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
19094-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
19094+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host, failedLookupLocations);
1909519095
if (resolutionFromCache) {
1909619096
return resolutionFromCache;
1909719097
}
@@ -19158,12 +19158,13 @@ var ts;
1915819158
typesPackageName;
1915919159
}
1916019160
ts.getUnmangledNameForScopedPackage = getUnmangledNameForScopedPackage;
19161-
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host) {
19161+
function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, traceEnabled, host, failedLookupLocations) {
1916219162
var result = cache && cache.get(containingDirectory);
1916319163
if (result) {
1916419164
if (traceEnabled) {
1916519165
trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
1916619166
}
19167+
failedLookupLocations.push.apply(failedLookupLocations, result.failedLookupLocations);
1916719168
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
1916819169
}
1916919170
}
@@ -19182,7 +19183,7 @@ var ts;
1918219183
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
1918319184
if (!ts.isExternalModuleNameRelative(moduleName)) {
1918419185
var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
19185-
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
19186+
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host, failedLookupLocations);
1918619187
if (resolutionFromCache) {
1918719188
return resolutionFromCache;
1918819189
}

0 commit comments

Comments
 (0)