Skip to content

Commit

Permalink
Update LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhegazy
mhegazy committed Dec 23, 2016
1 parent 5f720c2 commit dde8411
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 66 deletions.
24 changes: 13 additions & 11 deletions lib/tsc.js
View file
Expand Up @@ -18964,13 +18964,7 @@ var ts;
case 0:
return tryReadFromField("typings") || tryReadFromField("types");
case 1:
if (typeof jsonContent.main === "string") {
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
}
return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
}
return undefined;
return tryReadFromField("main");
}
function tryReadFromField(fieldName) {
if (ts.hasProperty(jsonContent, fieldName)) {
Expand Down Expand Up @@ -19488,12 +19482,20 @@ var ts;
if (resolved_3) {
return resolved_3;
}
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
}
}
var resolved = tryAddingExtensions(mainOrTypesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved) {
return resolved;
}
if (extensions === 1) {
var resolved_4 = tryAddingExtensions(mainOrTypesFile, 1, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved_4) {
return resolved_4;
}
}
}
else {
if (state.traceEnabled) {
Expand Down Expand Up @@ -19584,16 +19586,16 @@ var ts;
}
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
if (moduleHasNonRelativeName(moduleName)) {
var resolved_4 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolved_5 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
if (resolutionFromCache) {
return resolutionFromCache;
}
var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state));
});
if (resolved_4) {
return resolved_4;
if (resolved_5) {
return resolved_5;
}
if (extensions === 0) {
return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
Expand Down
24 changes: 13 additions & 11 deletions lib/tsserver.js
View file
Expand Up @@ -6323,13 +6323,7 @@ var ts;
case 0:
return tryReadFromField("typings") || tryReadFromField("types");
case 1:
if (typeof jsonContent.main === "string") {
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
}
return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
}
return undefined;
return tryReadFromField("main");
}
function tryReadFromField(fieldName) {
if (ts.hasProperty(jsonContent, fieldName)) {
Expand Down Expand Up @@ -6847,12 +6841,20 @@ var ts;
if (resolved_3) {
return resolved_3;
}
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
}
}
var resolved = tryAddingExtensions(mainOrTypesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved) {
return resolved;
}
if (extensions === 1) {
var resolved_4 = tryAddingExtensions(mainOrTypesFile, 1, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved_4) {
return resolved_4;
}
}
}
else {
if (state.traceEnabled) {
Expand Down Expand Up @@ -6943,16 +6945,16 @@ var ts;
}
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
if (moduleHasNonRelativeName(moduleName)) {
var resolved_4 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolved_5 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
if (resolutionFromCache) {
return resolutionFromCache;
}
var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state));
});
if (resolved_4) {
return resolved_4;
if (resolved_5) {
return resolved_5;
}
if (extensions === 0) {
return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
Expand Down
24 changes: 13 additions & 11 deletions lib/tsserverlibrary.js
View file
Expand Up @@ -6323,13 +6323,7 @@ var ts;
case 0:
return tryReadFromField("typings") || tryReadFromField("types");
case 1:
if (typeof jsonContent.main === "string") {
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
}
return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
}
return undefined;
return tryReadFromField("main");
}
function tryReadFromField(fieldName) {
if (ts.hasProperty(jsonContent, fieldName)) {
Expand Down Expand Up @@ -6847,12 +6841,20 @@ var ts;
if (resolved_3) {
return resolved_3;
}
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
}
}
var resolved = tryAddingExtensions(mainOrTypesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved) {
return resolved;
}
if (extensions === 1) {
var resolved_4 = tryAddingExtensions(mainOrTypesFile, 1, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved_4) {
return resolved_4;
}
}
}
else {
if (state.traceEnabled) {
Expand Down Expand Up @@ -6943,16 +6945,16 @@ var ts;
}
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
if (moduleHasNonRelativeName(moduleName)) {
var resolved_4 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolved_5 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
if (resolutionFromCache) {
return resolutionFromCache;
}
var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state));
});
if (resolved_4) {
return resolved_4;
if (resolved_5) {
return resolved_5;
}
if (extensions === 0) {
return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
Expand Down
27 changes: 16 additions & 11 deletions lib/typescript.js
View file
Expand Up @@ -23428,13 +23428,7 @@ var ts;
case 0 /* TypeScript */:
return tryReadFromField("typings") || tryReadFromField("types");
case 1 /* JavaScript */:
if (typeof jsonContent.main === "string") {
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
}
return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
}
return undefined;
return tryReadFromField("main");
}
function tryReadFromField(fieldName) {
if (ts.hasProperty(jsonContent, fieldName)) {
Expand Down Expand Up @@ -24077,12 +24071,23 @@ var ts;
if (resolved_3) {
return resolved_3;
}
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
}
}
var resolved = tryAddingExtensions(mainOrTypesFile, 0 /* TypeScript */, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved) {
return resolved;
}
if (extensions === 1 /* JavaScript */) {
// A package.json "main" may specify an exact filename, or may choose to omit an extension.
// We tried the ts extensions erlier, now try the js extensions.
// tryReadPackageJsonMainOrTypes returns main iff extensions is Extensions.JavaScript.
var resolved_4 = tryAddingExtensions(mainOrTypesFile, 1 /* JavaScript */, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved_4) {
return resolved_4;
}
}
}
else {
if (state.traceEnabled) {
Expand Down Expand Up @@ -24179,16 +24184,16 @@ var ts;
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
if (moduleHasNonRelativeName(moduleName)) {
// Climb up parent directories looking for a module.
var resolved_4 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolved_5 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
if (resolutionFromCache) {
return resolutionFromCache;
}
var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state));
});
if (resolved_4) {
return resolved_4;
if (resolved_5) {
return resolved_5;
}
if (extensions === 0 /* TypeScript */) {
// If we didn't find the file normally, look it up in @types.
Expand Down
27 changes: 16 additions & 11 deletions lib/typescriptServices.js
View file
Expand Up @@ -23428,13 +23428,7 @@ var ts;
case 0 /* TypeScript */:
return tryReadFromField("typings") || tryReadFromField("types");
case 1 /* JavaScript */:
if (typeof jsonContent.main === "string") {
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
}
return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
}
return undefined;
return tryReadFromField("main");
}
function tryReadFromField(fieldName) {
if (ts.hasProperty(jsonContent, fieldName)) {
Expand Down Expand Up @@ -24077,12 +24071,23 @@ var ts;
if (resolved_3) {
return resolved_3;
}
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
}
}
var resolved = tryAddingExtensions(mainOrTypesFile, 0 /* TypeScript */, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved) {
return resolved;
}
if (extensions === 1 /* JavaScript */) {
// A package.json "main" may specify an exact filename, or may choose to omit an extension.
// We tried the ts extensions erlier, now try the js extensions.
// tryReadPackageJsonMainOrTypes returns main iff extensions is Extensions.JavaScript.
var resolved_4 = tryAddingExtensions(mainOrTypesFile, 1 /* JavaScript */, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved_4) {
return resolved_4;
}
}
}
else {
if (state.traceEnabled) {
Expand Down Expand Up @@ -24179,16 +24184,16 @@ var ts;
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
if (moduleHasNonRelativeName(moduleName)) {
// Climb up parent directories looking for a module.
var resolved_4 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolved_5 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
if (resolutionFromCache) {
return resolutionFromCache;
}
var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state));
});
if (resolved_4) {
return resolved_4;
if (resolved_5) {
return resolved_5;
}
if (extensions === 0 /* TypeScript */) {
// If we didn't find the file normally, look it up in @types.
Expand Down
24 changes: 13 additions & 11 deletions lib/typingsInstaller.js
View file
Expand Up @@ -6130,13 +6130,7 @@ var ts;
case 0:
return tryReadFromField("typings") || tryReadFromField("types");
case 1:
if (typeof jsonContent.main === "string") {
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
}
return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
}
return undefined;
return tryReadFromField("main");
}
function tryReadFromField(fieldName) {
if (ts.hasProperty(jsonContent, fieldName)) {
Expand Down Expand Up @@ -6654,12 +6648,20 @@ var ts;
if (resolved_3) {
return resolved_3;
}
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
if (state.traceEnabled) {
trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
}
}
var resolved = tryAddingExtensions(mainOrTypesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved) {
return resolved;
}
if (extensions === 1) {
var resolved_4 = tryAddingExtensions(mainOrTypesFile, 1, failedLookupLocations, onlyRecordFailures_1, state);
if (resolved_4) {
return resolved_4;
}
}
}
else {
if (state.traceEnabled) {
Expand Down Expand Up @@ -6750,16 +6752,16 @@ var ts;
}
var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
if (moduleHasNonRelativeName(moduleName)) {
var resolved_4 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolved_5 = forEachAncestorDirectory(containingDirectory, function (directory) {
var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
if (resolutionFromCache) {
return resolutionFromCache;
}
var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state));
});
if (resolved_4) {
return resolved_4;
if (resolved_5) {
return resolved_5;
}
if (extensions === 0) {
return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
Expand Down

0 comments on commit dde8411

Please sign in to comment.