Skip to content

Commit 0c443c2

Browse files
committed
Update LKG
1 parent b6aeaab commit 0c443c2

File tree

5 files changed

+115
-35
lines changed

5 files changed

+115
-35
lines changed

lib/tsc.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13414,6 +13414,7 @@ var ts;
1341413414
var assignableRelation = ts.createMap();
1341513415
var comparableRelation = ts.createMap();
1341613416
var identityRelation = ts.createMap();
13417+
var enumRelation = ts.createMap();
1341713418
var _displayBuilder;
1341813419
var builtinGlobals = ts.createMap();
1341913420
builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
@@ -18129,8 +18130,14 @@ var ts;
1812918130
if (source === target) {
1813018131
return true;
1813118132
}
18132-
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256) || !(target.symbol.flags & 256)) {
18133-
return false;
18133+
var id = source.id + "," + target.id;
18134+
if (enumRelation[id] !== undefined) {
18135+
return enumRelation[id];
18136+
}
18137+
if (source.symbol.name !== target.symbol.name ||
18138+
!(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
18139+
(source.flags & 524288) !== (target.flags & 524288)) {
18140+
return enumRelation[id] = false;
1813418141
}
1813518142
var targetEnumType = getTypeOfSymbol(target.symbol);
1813618143
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@@ -18141,11 +18148,11 @@ var ts;
1814118148
if (errorReporter) {
1814218149
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
1814318150
}
18144-
return false;
18151+
return enumRelation[id] = false;
1814518152
}
1814618153
}
1814718154
}
18148-
return true;
18155+
return enumRelation[id] = true;
1814918156
}
1815018157
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
1815118158
if (target.flags & 8192)
@@ -18169,10 +18176,19 @@ var ts;
1816918176
if (relation === assignableRelation || relation === comparableRelation) {
1817018177
if (source.flags & 1)
1817118178
return true;
18172-
if (source.flags & (4 | 64) && target.flags & 16)
18179+
if ((source.flags & 4 | source.flags & 64) && target.flags & 272)
1817318180
return true;
18174-
if (source.flags & 64 && target.flags & 256 && source.text === target.text)
18181+
if (source.flags & 256 &&
18182+
target.flags & 256 &&
18183+
source.text === target.text &&
18184+
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
1817518185
return true;
18186+
}
18187+
if (source.flags & 256 &&
18188+
target.flags & 16 &&
18189+
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
18190+
return true;
18191+
}
1817618192
}
1817718193
return false;
1817818194
}
@@ -36543,7 +36559,7 @@ var ts;
3654336559
})(ts || (ts = {}));
3654436560
var ts;
3654536561
(function (ts) {
36546-
ts.version = "2.0.2";
36562+
ts.version = "2.0.3";
3654736563
var emptyArray = [];
3654836564
function findConfigFile(searchPath, fileExists) {
3654936565
while (true) {

lib/tsserver.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14410,6 +14410,7 @@ var ts;
1441014410
var assignableRelation = ts.createMap();
1441114411
var comparableRelation = ts.createMap();
1441214412
var identityRelation = ts.createMap();
14413+
var enumRelation = ts.createMap();
1441314414
var _displayBuilder;
1441414415
var builtinGlobals = ts.createMap();
1441514416
builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
@@ -19125,8 +19126,14 @@ var ts;
1912519126
if (source === target) {
1912619127
return true;
1912719128
}
19128-
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256) || !(target.symbol.flags & 256)) {
19129-
return false;
19129+
var id = source.id + "," + target.id;
19130+
if (enumRelation[id] !== undefined) {
19131+
return enumRelation[id];
19132+
}
19133+
if (source.symbol.name !== target.symbol.name ||
19134+
!(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
19135+
(source.flags & 524288) !== (target.flags & 524288)) {
19136+
return enumRelation[id] = false;
1913019137
}
1913119138
var targetEnumType = getTypeOfSymbol(target.symbol);
1913219139
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@@ -19137,11 +19144,11 @@ var ts;
1913719144
if (errorReporter) {
1913819145
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
1913919146
}
19140-
return false;
19147+
return enumRelation[id] = false;
1914119148
}
1914219149
}
1914319150
}
19144-
return true;
19151+
return enumRelation[id] = true;
1914519152
}
1914619153
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
1914719154
if (target.flags & 8192)
@@ -19165,10 +19172,19 @@ var ts;
1916519172
if (relation === assignableRelation || relation === comparableRelation) {
1916619173
if (source.flags & 1)
1916719174
return true;
19168-
if (source.flags & (4 | 64) && target.flags & 16)
19175+
if ((source.flags & 4 | source.flags & 64) && target.flags & 272)
1916919176
return true;
19170-
if (source.flags & 64 && target.flags & 256 && source.text === target.text)
19177+
if (source.flags & 256 &&
19178+
target.flags & 256 &&
19179+
source.text === target.text &&
19180+
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
1917119181
return true;
19182+
}
19183+
if (source.flags & 256 &&
19184+
target.flags & 16 &&
19185+
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
19186+
return true;
19187+
}
1917219188
}
1917319189
return false;
1917419190
}
@@ -37539,7 +37555,7 @@ var ts;
3753937555
})(ts || (ts = {}));
3754037556
var ts;
3754137557
(function (ts) {
37542-
ts.version = "2.0.2";
37558+
ts.version = "2.0.3";
3754337559
var emptyArray = [];
3754437560
function findConfigFile(searchPath, fileExists) {
3754537561
while (true) {

lib/tsserverlibrary.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14410,6 +14410,7 @@ var ts;
1441014410
var assignableRelation = ts.createMap();
1441114411
var comparableRelation = ts.createMap();
1441214412
var identityRelation = ts.createMap();
14413+
var enumRelation = ts.createMap();
1441314414
var _displayBuilder;
1441414415
var builtinGlobals = ts.createMap();
1441514416
builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
@@ -19125,8 +19126,14 @@ var ts;
1912519126
if (source === target) {
1912619127
return true;
1912719128
}
19128-
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256) || !(target.symbol.flags & 256)) {
19129-
return false;
19129+
var id = source.id + "," + target.id;
19130+
if (enumRelation[id] !== undefined) {
19131+
return enumRelation[id];
19132+
}
19133+
if (source.symbol.name !== target.symbol.name ||
19134+
!(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
19135+
(source.flags & 524288) !== (target.flags & 524288)) {
19136+
return enumRelation[id] = false;
1913019137
}
1913119138
var targetEnumType = getTypeOfSymbol(target.symbol);
1913219139
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@@ -19137,11 +19144,11 @@ var ts;
1913719144
if (errorReporter) {
1913819145
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
1913919146
}
19140-
return false;
19147+
return enumRelation[id] = false;
1914119148
}
1914219149
}
1914319150
}
19144-
return true;
19151+
return enumRelation[id] = true;
1914519152
}
1914619153
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
1914719154
if (target.flags & 8192)
@@ -19165,10 +19172,19 @@ var ts;
1916519172
if (relation === assignableRelation || relation === comparableRelation) {
1916619173
if (source.flags & 1)
1916719174
return true;
19168-
if (source.flags & (4 | 64) && target.flags & 16)
19175+
if ((source.flags & 4 | source.flags & 64) && target.flags & 272)
1916919176
return true;
19170-
if (source.flags & 64 && target.flags & 256 && source.text === target.text)
19177+
if (source.flags & 256 &&
19178+
target.flags & 256 &&
19179+
source.text === target.text &&
19180+
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
1917119181
return true;
19182+
}
19183+
if (source.flags & 256 &&
19184+
target.flags & 16 &&
19185+
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
19186+
return true;
19187+
}
1917219188
}
1917319189
return false;
1917419190
}
@@ -37539,7 +37555,7 @@ var ts;
3753937555
})(ts || (ts = {}));
3754037556
var ts;
3754137557
(function (ts) {
37542-
ts.version = "2.0.2";
37558+
ts.version = "2.0.3";
3754337559
var emptyArray = [];
3754437560
function findConfigFile(searchPath, fileExists) {
3754537561
while (true) {

lib/typescript.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16791,6 +16791,7 @@ var ts;
1679116791
var assignableRelation = ts.createMap();
1679216792
var comparableRelation = ts.createMap();
1679316793
var identityRelation = ts.createMap();
16794+
var enumRelation = ts.createMap();
1679416795
// This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
1679516796
var _displayBuilder;
1679616797
var TypeSystemPropertyName;
@@ -22135,8 +22136,14 @@ var ts;
2213522136
if (source === target) {
2213622137
return true;
2213722138
}
22138-
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */)) {
22139-
return false;
22139+
var id = source.id + "," + target.id;
22140+
if (enumRelation[id] !== undefined) {
22141+
return enumRelation[id];
22142+
}
22143+
if (source.symbol.name !== target.symbol.name ||
22144+
!(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */) ||
22145+
(source.flags & 524288 /* Union */) !== (target.flags & 524288 /* Union */)) {
22146+
return enumRelation[id] = false;
2214022147
}
2214122148
var targetEnumType = getTypeOfSymbol(target.symbol);
2214222149
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@@ -22147,11 +22154,11 @@ var ts;
2214722154
if (errorReporter) {
2214822155
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
2214922156
}
22150-
return false;
22157+
return enumRelation[id] = false;
2215122158
}
2215222159
}
2215322160
}
22154-
return true;
22161+
return enumRelation[id] = true;
2215522162
}
2215622163
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
2215722164
if (target.flags & 8192 /* Never */)
@@ -22175,10 +22182,19 @@ var ts;
2217522182
if (relation === assignableRelation || relation === comparableRelation) {
2217622183
if (source.flags & 1 /* Any */)
2217722184
return true;
22178-
if (source.flags & (4 /* Number */ | 64 /* NumberLiteral */) && target.flags & 16 /* Enum */)
22185+
if ((source.flags & 4 /* Number */ | source.flags & 64 /* NumberLiteral */) && target.flags & 272 /* EnumLike */)
2217922186
return true;
22180-
if (source.flags & 64 /* NumberLiteral */ && target.flags & 256 /* EnumLiteral */ && source.text === target.text)
22187+
if (source.flags & 256 /* EnumLiteral */ &&
22188+
target.flags & 256 /* EnumLiteral */ &&
22189+
source.text === target.text &&
22190+
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
2218122191
return true;
22192+
}
22193+
if (source.flags & 256 /* EnumLiteral */ &&
22194+
target.flags & 16 /* Enum */ &&
22195+
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
22196+
return true;
22197+
}
2218222198
}
2218322199
return false;
2218422200
}
@@ -43950,7 +43966,7 @@ var ts;
4395043966
var ts;
4395143967
(function (ts) {
4395243968
/** The version of the TypeScript compiler release */
43953-
ts.version = "2.0.2";
43969+
ts.version = "2.0.3";
4395443970
var emptyArray = [];
4395543971
function findConfigFile(searchPath, fileExists) {
4395643972
while (true) {

lib/typescriptServices.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16791,6 +16791,7 @@ var ts;
1679116791
var assignableRelation = ts.createMap();
1679216792
var comparableRelation = ts.createMap();
1679316793
var identityRelation = ts.createMap();
16794+
var enumRelation = ts.createMap();
1679416795
// This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
1679516796
var _displayBuilder;
1679616797
var TypeSystemPropertyName;
@@ -22135,8 +22136,14 @@ var ts;
2213522136
if (source === target) {
2213622137
return true;
2213722138
}
22138-
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */)) {
22139-
return false;
22139+
var id = source.id + "," + target.id;
22140+
if (enumRelation[id] !== undefined) {
22141+
return enumRelation[id];
22142+
}
22143+
if (source.symbol.name !== target.symbol.name ||
22144+
!(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */) ||
22145+
(source.flags & 524288 /* Union */) !== (target.flags & 524288 /* Union */)) {
22146+
return enumRelation[id] = false;
2214022147
}
2214122148
var targetEnumType = getTypeOfSymbol(target.symbol);
2214222149
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@@ -22147,11 +22154,11 @@ var ts;
2214722154
if (errorReporter) {
2214822155
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
2214922156
}
22150-
return false;
22157+
return enumRelation[id] = false;
2215122158
}
2215222159
}
2215322160
}
22154-
return true;
22161+
return enumRelation[id] = true;
2215522162
}
2215622163
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
2215722164
if (target.flags & 8192 /* Never */)
@@ -22175,10 +22182,19 @@ var ts;
2217522182
if (relation === assignableRelation || relation === comparableRelation) {
2217622183
if (source.flags & 1 /* Any */)
2217722184
return true;
22178-
if (source.flags & (4 /* Number */ | 64 /* NumberLiteral */) && target.flags & 16 /* Enum */)
22185+
if ((source.flags & 4 /* Number */ | source.flags & 64 /* NumberLiteral */) && target.flags & 272 /* EnumLike */)
2217922186
return true;
22180-
if (source.flags & 64 /* NumberLiteral */ && target.flags & 256 /* EnumLiteral */ && source.text === target.text)
22187+
if (source.flags & 256 /* EnumLiteral */ &&
22188+
target.flags & 256 /* EnumLiteral */ &&
22189+
source.text === target.text &&
22190+
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
2218122191
return true;
22192+
}
22193+
if (source.flags & 256 /* EnumLiteral */ &&
22194+
target.flags & 16 /* Enum */ &&
22195+
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
22196+
return true;
22197+
}
2218222198
}
2218322199
return false;
2218422200
}
@@ -43950,7 +43966,7 @@ var ts;
4395043966
var ts;
4395143967
(function (ts) {
4395243968
/** The version of the TypeScript compiler release */
43953-
ts.version = "2.0.2";
43969+
ts.version = "2.0.3";
4395443970
var emptyArray = [];
4395543971
function findConfigFile(searchPath, fileExists) {
4395643972
while (true) {

0 commit comments

Comments
 (0)