Skip to content

Commit e1df139

Browse files
committed
Port other missing TypeFlags changes
1 parent e4e9fe7 commit e1df139

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/compiler/types.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6285,11 +6285,11 @@ export const enum TypeFlags {
62856285
ESSymbol = 1 << 9, // Type of symbol primitive introduced in ES6
62866286
StringLiteral = 1 << 10,
62876287
NumberLiteral = 1 << 11,
6288-
BooleanLiteral = 1 << 12,
6289-
BigIntLiteral = 1 << 13,
6288+
BigIntLiteral = 1 << 12,
6289+
BooleanLiteral = 1 << 13,
62906290
UniqueESSymbol = 1 << 14, // unique symbol
62916291
EnumLiteral = 1 << 15, // Always combined with StringLiteral, NumberLiteral, or Union
6292-
Enum = 1 << 16, // Numeric computed enum member value
6292+
Enum = 1 << 16, // Numeric computed enum member value (must be right after EnumLiteral, see getSortOrderFlags)
62936293
NonPrimitive = 1 << 17, // intrinsic object type
62946294
Never = 1 << 18, // Never type
62956295
TypeParameter = 1 << 19, // Type parameter
@@ -6306,7 +6306,8 @@ export const enum TypeFlags {
63066306
Reserved1 = 1 << 29, // Used by union/intersection type construction
63076307
/** @internal */
63086308
Reserved2 = 1 << 30, // Used by union/intersection type construction
6309-
6309+
/** @internal */
6310+
Reserved3 = 1 << 31,
63106311
/** @internal */
63116312
AnyOrUnknown = Any | Unknown,
63126313
/** @internal */

tests/baselines/reference/api/typescript.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6580,8 +6580,8 @@ declare namespace ts {
65806580
ESSymbol = 512,
65816581
StringLiteral = 1024,
65826582
NumberLiteral = 2048,
6583-
BooleanLiteral = 4096,
6584-
BigIntLiteral = 8192,
6583+
BigIntLiteral = 4096,
6584+
BooleanLiteral = 8192,
65856585
UniqueESSymbol = 16384,
65866586
EnumLiteral = 32768,
65876587
Enum = 65536,
@@ -6604,8 +6604,8 @@ declare namespace ts {
66046604
PossiblyFalsy = 15868,
66056605
StringLike = 12583968,
66066606
NumberLike = 67648,
6607-
BigIntLike = 8320,
6608-
BooleanLike = 4352,
6607+
BigIntLike = 4224,
6608+
BooleanLike = 8448,
66096609
EnumLike = 98304,
66106610
ESSymbolLike = 16896,
66116611
VoidLike = 20,

tests/baselines/reference/narrowingUnionToUnion.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function fx2<T>(x: T | undefined) {
4848
> : ^^^^^^^^^^^^^
4949

5050
x; // T & Falsy | undefined
51-
>x : (T & null) | (T & "") | (T & 0) | (T & false) | (T & 0n) | undefined
51+
>x : (T & null) | (T & "") | (T & 0) | (T & 0n) | (T & false) | undefined
5252
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5353
}
5454
}

0 commit comments

Comments
 (0)