Skip to content

Commit 37cbfe2

Browse files
DanielRosenwasserDanielRosenwasser
committed
Update LKG.
1 parent e8938a8 commit 37cbfe2

6 files changed

Lines changed: 84 additions & 48 deletions

File tree

‎lib/tsc.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20065,7 +20065,7 @@ var ts;
2006520065
}
2006620066
function convertToTSConfig(configParseResult, configFileName, host) {
2006720067
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
20068-
var files = ts.map(ts.filter(configParseResult.fileNames, !configParseResult.configFileSpecs ? function (_) { return false; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), f, getCanonicalFileName); });
20068+
var files = ts.map(ts.filter(configParseResult.fileNames, (!configParseResult.configFileSpecs || !configParseResult.configFileSpecs.validatedIncludeSpecs) ? function (_) { return true; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), ts.getNormalizedAbsolutePath(f, host.getCurrentDirectory()), getCanonicalFileName); });
2006920069
var optionMap = serializeCompilerOptions(configParseResult.options, { configFilePath: ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), useCaseSensitiveFileNames: host.useCaseSensitiveFileNames });
2007020070
var config = __assign({ compilerOptions: __assign({}, ts.arrayFrom(optionMap.entries()).reduce(function (prev, cur) {
2007120071
var _a;
@@ -20088,20 +20088,20 @@ var ts;
2008820088
}
2008920089
function matchesSpecs(path, includeSpecs, excludeSpecs) {
2009020090
if (!includeSpecs)
20091-
return function (_) { return false; };
20091+
return function (_) { return true; };
2009220092
var patterns = ts.getFileMatcherPatterns(path, excludeSpecs, includeSpecs, ts.sys.useCaseSensitiveFileNames, ts.sys.getCurrentDirectory());
2009320093
var excludeRe = patterns.excludePattern && ts.getRegexFromPattern(patterns.excludePattern, ts.sys.useCaseSensitiveFileNames);
2009420094
var includeRe = patterns.includeFilePattern && ts.getRegexFromPattern(patterns.includeFilePattern, ts.sys.useCaseSensitiveFileNames);
2009520095
if (includeRe) {
2009620096
if (excludeRe) {
20097-
return function (path) { return includeRe.test(path) && !excludeRe.test(path); };
20097+
return function (path) { return !(includeRe.test(path) && !excludeRe.test(path)); };
2009820098
}
20099-
return function (path) { return includeRe.test(path); };
20099+
return function (path) { return !includeRe.test(path); };
2010020100
}
2010120101
if (excludeRe) {
20102-
return function (path) { return !excludeRe.test(path); };
20102+
return function (path) { return excludeRe.test(path); };
2010320103
}
20104-
return function (_) { return false; };
20104+
return function (_) { return true; };
2010520105
}
2010620106
function getCustomTypeMapOfCommandLineOption(optionDefinition) {
2010720107
if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
@@ -32671,8 +32671,13 @@ var ts;
3267132671
if (!(ts.getDeclarationModifierFlagsFromSymbol(prop) & 24)) {
3267232672
var type = getLateBoundSymbol(prop).nameType;
3267332673
if (!type && !ts.isKnownSymbol(prop)) {
32674-
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
32675-
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
32674+
if (prop.escapedName === "default") {
32675+
type = getLiteralType("default");
32676+
}
32677+
else {
32678+
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
32679+
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
32680+
}
3267632681
}
3267732682
if (type && type.flags & include) {
3267832683
return type;
@@ -41728,6 +41733,7 @@ var ts;
4172841733
if (hasSyntheticDefault) {
4172941734
var memberTable = ts.createSymbolTable();
4173041735
var newSymbol = createSymbol(2097152, "default");
41736+
newSymbol.nameType = getLiteralType("default");
4173141737
newSymbol.target = resolveSymbol(symbol);
4173241738
memberTable.set("default", newSymbol);
4173341739
var anonymousSymbol = createSymbol(2048, "__type");

‎lib/tsserver.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24707,7 +24707,7 @@ var ts;
2470724707
/** @internal */
2470824708
function convertToTSConfig(configParseResult, configFileName, host) {
2470924709
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
24710-
var files = ts.map(ts.filter(configParseResult.fileNames, !configParseResult.configFileSpecs ? function (_) { return false; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), f, getCanonicalFileName); });
24710+
var files = ts.map(ts.filter(configParseResult.fileNames, (!configParseResult.configFileSpecs || !configParseResult.configFileSpecs.validatedIncludeSpecs) ? function (_) { return true; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), ts.getNormalizedAbsolutePath(f, host.getCurrentDirectory()), getCanonicalFileName); });
2471124711
var optionMap = serializeCompilerOptions(configParseResult.options, { configFilePath: ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), useCaseSensitiveFileNames: host.useCaseSensitiveFileNames });
2471224712
var config = __assign({ compilerOptions: __assign({}, ts.arrayFrom(optionMap.entries()).reduce(function (prev, cur) {
2471324713
var _a;
@@ -24730,20 +24730,20 @@ var ts;
2473024730
}
2473124731
function matchesSpecs(path, includeSpecs, excludeSpecs) {
2473224732
if (!includeSpecs)
24733-
return function (_) { return false; };
24733+
return function (_) { return true; };
2473424734
var patterns = ts.getFileMatcherPatterns(path, excludeSpecs, includeSpecs, ts.sys.useCaseSensitiveFileNames, ts.sys.getCurrentDirectory());
2473524735
var excludeRe = patterns.excludePattern && ts.getRegexFromPattern(patterns.excludePattern, ts.sys.useCaseSensitiveFileNames);
2473624736
var includeRe = patterns.includeFilePattern && ts.getRegexFromPattern(patterns.includeFilePattern, ts.sys.useCaseSensitiveFileNames);
2473724737
if (includeRe) {
2473824738
if (excludeRe) {
24739-
return function (path) { return includeRe.test(path) && !excludeRe.test(path); };
24739+
return function (path) { return !(includeRe.test(path) && !excludeRe.test(path)); };
2474024740
}
24741-
return function (path) { return includeRe.test(path); };
24741+
return function (path) { return !includeRe.test(path); };
2474224742
}
2474324743
if (excludeRe) {
24744-
return function (path) { return !excludeRe.test(path); };
24744+
return function (path) { return excludeRe.test(path); };
2474524745
}
24746-
return function (_) { return false; };
24746+
return function (_) { return true; };
2474724747
}
2474824748
function getCustomTypeMapOfCommandLineOption(optionDefinition) {
2474924749
if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
@@ -39378,8 +39378,13 @@ var ts;
3937839378
if (!(ts.getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */)) {
3937939379
var type = getLateBoundSymbol(prop).nameType;
3938039380
if (!type && !ts.isKnownSymbol(prop)) {
39381-
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
39382-
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
39381+
if (prop.escapedName === "default" /* Default */) {
39382+
type = getLiteralType("default");
39383+
}
39384+
else {
39385+
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
39386+
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
39387+
}
3938339388
}
3938439389
if (type && type.flags & include) {
3938539390
return type;
@@ -49994,6 +49999,7 @@ var ts;
4999449999
if (hasSyntheticDefault) {
4999550000
var memberTable = ts.createSymbolTable();
4999650001
var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
50002+
newSymbol.nameType = getLiteralType("default");
4999750003
newSymbol.target = resolveSymbol(symbol);
4999850004
memberTable.set("default" /* Default */, newSymbol);
4999950005
var anonymousSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);

‎lib/tsserverlibrary.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24703,7 +24703,7 @@ var ts;
2470324703
/** @internal */
2470424704
function convertToTSConfig(configParseResult, configFileName, host) {
2470524705
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
24706-
var files = ts.map(ts.filter(configParseResult.fileNames, !configParseResult.configFileSpecs ? function (_) { return false; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), f, getCanonicalFileName); });
24706+
var files = ts.map(ts.filter(configParseResult.fileNames, (!configParseResult.configFileSpecs || !configParseResult.configFileSpecs.validatedIncludeSpecs) ? function (_) { return true; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), ts.getNormalizedAbsolutePath(f, host.getCurrentDirectory()), getCanonicalFileName); });
2470724707
var optionMap = serializeCompilerOptions(configParseResult.options, { configFilePath: ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), useCaseSensitiveFileNames: host.useCaseSensitiveFileNames });
2470824708
var config = __assign({ compilerOptions: __assign({}, ts.arrayFrom(optionMap.entries()).reduce(function (prev, cur) {
2470924709
var _a;
@@ -24726,20 +24726,20 @@ var ts;
2472624726
}
2472724727
function matchesSpecs(path, includeSpecs, excludeSpecs) {
2472824728
if (!includeSpecs)
24729-
return function (_) { return false; };
24729+
return function (_) { return true; };
2473024730
var patterns = ts.getFileMatcherPatterns(path, excludeSpecs, includeSpecs, ts.sys.useCaseSensitiveFileNames, ts.sys.getCurrentDirectory());
2473124731
var excludeRe = patterns.excludePattern && ts.getRegexFromPattern(patterns.excludePattern, ts.sys.useCaseSensitiveFileNames);
2473224732
var includeRe = patterns.includeFilePattern && ts.getRegexFromPattern(patterns.includeFilePattern, ts.sys.useCaseSensitiveFileNames);
2473324733
if (includeRe) {
2473424734
if (excludeRe) {
24735-
return function (path) { return includeRe.test(path) && !excludeRe.test(path); };
24735+
return function (path) { return !(includeRe.test(path) && !excludeRe.test(path)); };
2473624736
}
24737-
return function (path) { return includeRe.test(path); };
24737+
return function (path) { return !includeRe.test(path); };
2473824738
}
2473924739
if (excludeRe) {
24740-
return function (path) { return !excludeRe.test(path); };
24740+
return function (path) { return excludeRe.test(path); };
2474124741
}
24742-
return function (_) { return false; };
24742+
return function (_) { return true; };
2474324743
}
2474424744
function getCustomTypeMapOfCommandLineOption(optionDefinition) {
2474524745
if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
@@ -39374,8 +39374,13 @@ var ts;
3937439374
if (!(ts.getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */)) {
3937539375
var type = getLateBoundSymbol(prop).nameType;
3937639376
if (!type && !ts.isKnownSymbol(prop)) {
39377-
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
39378-
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
39377+
if (prop.escapedName === "default" /* Default */) {
39378+
type = getLiteralType("default");
39379+
}
39380+
else {
39381+
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
39382+
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
39383+
}
3937939384
}
3938039385
if (type && type.flags & include) {
3938139386
return type;
@@ -49990,6 +49995,7 @@ var ts;
4999049995
if (hasSyntheticDefault) {
4999149996
var memberTable = ts.createSymbolTable();
4999249997
var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
49998+
newSymbol.nameType = getLiteralType("default");
4999349999
newSymbol.target = resolveSymbol(symbol);
4999450000
memberTable.set("default" /* Default */, newSymbol);
4999550001
var anonymousSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);

‎lib/typescript.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24694,7 +24694,7 @@ var ts;
2469424694
/** @internal */
2469524695
function convertToTSConfig(configParseResult, configFileName, host) {
2469624696
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
24697-
var files = ts.map(ts.filter(configParseResult.fileNames, !configParseResult.configFileSpecs ? function (_) { return false; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), f, getCanonicalFileName); });
24697+
var files = ts.map(ts.filter(configParseResult.fileNames, (!configParseResult.configFileSpecs || !configParseResult.configFileSpecs.validatedIncludeSpecs) ? function (_) { return true; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), ts.getNormalizedAbsolutePath(f, host.getCurrentDirectory()), getCanonicalFileName); });
2469824698
var optionMap = serializeCompilerOptions(configParseResult.options, { configFilePath: ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), useCaseSensitiveFileNames: host.useCaseSensitiveFileNames });
2469924699
var config = __assign({ compilerOptions: __assign({}, ts.arrayFrom(optionMap.entries()).reduce(function (prev, cur) {
2470024700
var _a;
@@ -24717,20 +24717,20 @@ var ts;
2471724717
}
2471824718
function matchesSpecs(path, includeSpecs, excludeSpecs) {
2471924719
if (!includeSpecs)
24720-
return function (_) { return false; };
24720+
return function (_) { return true; };
2472124721
var patterns = ts.getFileMatcherPatterns(path, excludeSpecs, includeSpecs, ts.sys.useCaseSensitiveFileNames, ts.sys.getCurrentDirectory());
2472224722
var excludeRe = patterns.excludePattern && ts.getRegexFromPattern(patterns.excludePattern, ts.sys.useCaseSensitiveFileNames);
2472324723
var includeRe = patterns.includeFilePattern && ts.getRegexFromPattern(patterns.includeFilePattern, ts.sys.useCaseSensitiveFileNames);
2472424724
if (includeRe) {
2472524725
if (excludeRe) {
24726-
return function (path) { return includeRe.test(path) && !excludeRe.test(path); };
24726+
return function (path) { return !(includeRe.test(path) && !excludeRe.test(path)); };
2472724727
}
24728-
return function (path) { return includeRe.test(path); };
24728+
return function (path) { return !includeRe.test(path); };
2472924729
}
2473024730
if (excludeRe) {
24731-
return function (path) { return !excludeRe.test(path); };
24731+
return function (path) { return excludeRe.test(path); };
2473224732
}
24733-
return function (_) { return false; };
24733+
return function (_) { return true; };
2473424734
}
2473524735
function getCustomTypeMapOfCommandLineOption(optionDefinition) {
2473624736
if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
@@ -39365,8 +39365,13 @@ var ts;
3936539365
if (!(ts.getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */)) {
3936639366
var type = getLateBoundSymbol(prop).nameType;
3936739367
if (!type && !ts.isKnownSymbol(prop)) {
39368-
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
39369-
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
39368+
if (prop.escapedName === "default" /* Default */) {
39369+
type = getLiteralType("default");
39370+
}
39371+
else {
39372+
var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
39373+
type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
39374+
}
3937039375
}
3937139376
if (type && type.flags & include) {
3937239377
return type;
@@ -49981,6 +49986,7 @@ var ts;
4998149986
if (hasSyntheticDefault) {
4998249987
var memberTable = ts.createSymbolTable();
4998349988
var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
49989+
newSymbol.nameType = getLiteralType("default");
4998449990
newSymbol.target = resolveSymbol(symbol);
4998549991
memberTable.set("default" /* Default */, newSymbol);
4998649992
var anonymousSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);

0 commit comments

Comments
 (0)