Skip to content

Commit 4ce2280

Browse files
mhegazymhegazy
committed
Update LKG
1 parent 93e0451 commit 4ce2280

File tree

8 files changed

+60
-30
lines changed

8 files changed

+60
-30
lines changed

‎lib/tsc.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14792,8 +14792,13 @@ var ts;
1479214792
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
1479314793
}
1479414794
else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
14795-
var typeArguments = type.aliasTypeArguments;
14796-
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
14795+
if (type.flags & 2097152 || !(flags & 1024)) {
14796+
var typeArguments = type.aliasTypeArguments;
14797+
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
14798+
}
14799+
else {
14800+
writeUnionOrIntersectionType(type, nextFlags);
14801+
}
1479714802
}
1479814803
else if (type.flags & 1572864) {
1479914804
writeUnionOrIntersectionType(type, nextFlags);
@@ -29039,7 +29044,7 @@ var ts;
2903929044
}
2904029045
else {
2904129046
errorNameNode = declaration.name;
29042-
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
29047+
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
2904329048
errorNameNode = undefined;
2904429049
}
2904529050
}
@@ -29051,7 +29056,7 @@ var ts;
2905129056
}
2905229057
else {
2905329058
errorNameNode = signature.name;
29054-
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
29059+
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
2905529060
errorNameNode = undefined;
2905629061
}
2905729062
}
@@ -29244,7 +29249,7 @@ var ts;
2924429249
write(tempVarName);
2924529250
write(": ");
2924629251
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
29247-
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
29252+
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
2924829253
write(";");
2924929254
writeLine();
2925029255
write(node.isExportEquals ? "export = " : "export default ");
@@ -29649,7 +29654,7 @@ var ts;
2964929654
}
2965029655
else {
2965129656
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
29652-
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
29657+
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
2965329658
}
2965429659
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
2965529660
var diagnosticMessage;

‎lib/tsserver.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15788,8 +15788,13 @@ var ts;
1578815788
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
1578915789
}
1579015790
else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
15791-
var typeArguments = type.aliasTypeArguments;
15792-
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
15791+
if (type.flags & 2097152 || !(flags & 1024)) {
15792+
var typeArguments = type.aliasTypeArguments;
15793+
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
15794+
}
15795+
else {
15796+
writeUnionOrIntersectionType(type, nextFlags);
15797+
}
1579315798
}
1579415799
else if (type.flags & 1572864) {
1579515800
writeUnionOrIntersectionType(type, nextFlags);
@@ -30035,7 +30040,7 @@ var ts;
3003530040
}
3003630041
else {
3003730042
errorNameNode = declaration.name;
30038-
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
30043+
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
3003930044
errorNameNode = undefined;
3004030045
}
3004130046
}
@@ -30047,7 +30052,7 @@ var ts;
3004730052
}
3004830053
else {
3004930054
errorNameNode = signature.name;
30050-
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
30055+
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
3005130056
errorNameNode = undefined;
3005230057
}
3005330058
}
@@ -30240,7 +30245,7 @@ var ts;
3024030245
write(tempVarName);
3024130246
write(": ");
3024230247
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
30243-
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
30248+
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
3024430249
write(";");
3024530250
writeLine();
3024630251
write(node.isExportEquals ? "export = " : "export default ");
@@ -30645,7 +30650,7 @@ var ts;
3064530650
}
3064630651
else {
3064730652
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
30648-
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
30653+
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
3064930654
}
3065030655
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
3065130656
var diagnosticMessage;

‎lib/tsserverlibrary.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,7 @@ declare namespace ts {
13191319
UseFullyQualifiedType = 128,
13201320
InFirstTypeArgument = 256,
13211321
InTypeAlias = 512,
1322+
UseTypeAliasValue = 1024,
13221323
}
13231324
const enum SymbolFormatFlags {
13241325
None = 0,

‎lib/tsserverlibrary.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15788,8 +15788,13 @@ var ts;
1578815788
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
1578915789
}
1579015790
else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
15791-
var typeArguments = type.aliasTypeArguments;
15792-
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
15791+
if (type.flags & 2097152 || !(flags & 1024)) {
15792+
var typeArguments = type.aliasTypeArguments;
15793+
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
15794+
}
15795+
else {
15796+
writeUnionOrIntersectionType(type, nextFlags);
15797+
}
1579315798
}
1579415799
else if (type.flags & 1572864) {
1579515800
writeUnionOrIntersectionType(type, nextFlags);
@@ -30035,7 +30040,7 @@ var ts;
3003530040
}
3003630041
else {
3003730042
errorNameNode = declaration.name;
30038-
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
30043+
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
3003930044
errorNameNode = undefined;
3004030045
}
3004130046
}
@@ -30047,7 +30052,7 @@ var ts;
3004730052
}
3004830053
else {
3004930054
errorNameNode = signature.name;
30050-
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
30055+
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
3005130056
errorNameNode = undefined;
3005230057
}
3005330058
}
@@ -30240,7 +30245,7 @@ var ts;
3024030245
write(tempVarName);
3024130246
write(": ");
3024230247
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
30243-
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
30248+
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
3024430249
write(";");
3024530250
writeLine();
3024630251
write(node.isExportEquals ? "export = " : "export default ");
@@ -30645,7 +30650,7 @@ var ts;
3064530650
}
3064630651
else {
3064730652
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
30648-
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
30653+
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
3064930654
}
3065030655
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
3065130656
var diagnosticMessage;

‎lib/typescript.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,7 @@ declare namespace ts {
13281328
UseFullyQualifiedType = 128,
13291329
InFirstTypeArgument = 256,
13301330
InTypeAlias = 512,
1331+
UseTypeAliasValue = 1024,
13311332
}
13321333
enum SymbolFormatFlags {
13331334
None = 0,

‎lib/typescript.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ var ts;
480480
TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
481481
TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
482482
TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
483+
TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
483484
})(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
484485
var TypeFormatFlags = ts.TypeFormatFlags;
485486
(function (SymbolFormatFlags) {
@@ -18432,8 +18433,13 @@ var ts;
1843218433
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064 /* Type */, 0 /* None */, nextFlags);
1843318434
}
1843418435
else if (!(flags & 512 /* InTypeAlias */) && type.flags & (2097152 /* Anonymous */ | 1572864 /* UnionOrIntersection */) && type.aliasSymbol) {
18435-
var typeArguments = type.aliasTypeArguments;
18436-
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
18436+
if (type.flags & 2097152 /* Anonymous */ || !(flags & 1024 /* UseTypeAliasValue */)) {
18437+
var typeArguments = type.aliasTypeArguments;
18438+
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
18439+
}
18440+
else {
18441+
writeUnionOrIntersectionType(type, nextFlags);
18442+
}
1843718443
}
1843818444
else if (type.flags & 1572864 /* UnionOrIntersection */) {
1843918445
writeUnionOrIntersectionType(type, nextFlags);
@@ -35233,7 +35239,7 @@ var ts;
3523335239
}
3523435240
else {
3523535241
errorNameNode = declaration.name;
35236-
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35242+
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3523735243
errorNameNode = undefined;
3523835244
}
3523935245
}
@@ -35246,7 +35252,7 @@ var ts;
3524635252
}
3524735253
else {
3524835254
errorNameNode = signature.name;
35249-
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35255+
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3525035256
errorNameNode = undefined;
3525135257
}
3525235258
}
@@ -35448,7 +35454,7 @@ var ts;
3544835454
write(tempVarName);
3544935455
write(": ");
3545035456
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
35451-
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35457+
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3545235458
write(";");
3545335459
writeLine();
3545435460
write(node.isExportEquals ? "export = " : "export default ");
@@ -35869,7 +35875,7 @@ var ts;
3586935875
}
3587035876
else {
3587135877
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
35872-
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35878+
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3587335879
}
3587435880
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
3587535881
var diagnosticMessage;

‎lib/typescriptServices.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,7 @@ declare namespace ts {
13281328
UseFullyQualifiedType = 128,
13291329
InFirstTypeArgument = 256,
13301330
InTypeAlias = 512,
1331+
UseTypeAliasValue = 1024,
13311332
}
13321333
enum SymbolFormatFlags {
13331334
None = 0,

‎lib/typescriptServices.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ var ts;
480480
TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
481481
TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
482482
TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
483+
TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
483484
})(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
484485
var TypeFormatFlags = ts.TypeFormatFlags;
485486
(function (SymbolFormatFlags) {
@@ -18432,8 +18433,13 @@ var ts;
1843218433
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064 /* Type */, 0 /* None */, nextFlags);
1843318434
}
1843418435
else if (!(flags & 512 /* InTypeAlias */) && type.flags & (2097152 /* Anonymous */ | 1572864 /* UnionOrIntersection */) && type.aliasSymbol) {
18435-
var typeArguments = type.aliasTypeArguments;
18436-
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
18436+
if (type.flags & 2097152 /* Anonymous */ || !(flags & 1024 /* UseTypeAliasValue */)) {
18437+
var typeArguments = type.aliasTypeArguments;
18438+
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
18439+
}
18440+
else {
18441+
writeUnionOrIntersectionType(type, nextFlags);
18442+
}
1843718443
}
1843818444
else if (type.flags & 1572864 /* UnionOrIntersection */) {
1843918445
writeUnionOrIntersectionType(type, nextFlags);
@@ -35233,7 +35239,7 @@ var ts;
3523335239
}
3523435240
else {
3523535241
errorNameNode = declaration.name;
35236-
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35242+
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3523735243
errorNameNode = undefined;
3523835244
}
3523935245
}
@@ -35246,7 +35252,7 @@ var ts;
3524635252
}
3524735253
else {
3524835254
errorNameNode = signature.name;
35249-
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35255+
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3525035256
errorNameNode = undefined;
3525135257
}
3525235258
}
@@ -35448,7 +35454,7 @@ var ts;
3544835454
write(tempVarName);
3544935455
write(": ");
3545035456
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
35451-
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35457+
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3545235458
write(";");
3545335459
writeLine();
3545435460
write(node.isExportEquals ? "export = " : "export default ");
@@ -35869,7 +35875,7 @@ var ts;
3586935875
}
3587035876
else {
3587135877
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
35872-
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
35878+
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
3587335879
}
3587435880
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
3587535881
var diagnosticMessage;

0 commit comments

Comments
 (0)