Update to match tsgo PR 587

Author: jakebailey

src/compiler/checker.ts

@@ -52955,7 +52955,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 return c;
             }
         }
-        else if (t1.flags & (TypeFlags.EnumLiteral | TypeFlags.UniqueESSymbol)) {
+        else if (t1.flags & (TypeFlags.Enum | TypeFlags.EnumLiteral | TypeFlags.UniqueESSymbol)) {
             // Enum members are ordered by their symbol (and thus their declaration order).
             const c = compareSymbols(t1.symbol, t2.symbol);
             if (c !== 0) {
@@ -53070,9 +53070,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function getSortOrderFlags(t: Type): number {
-        // We want enum literal and computed values to be ordered by their declarations, so we merge TypeFlagsEnum into
-        // TypeFlagsEnumLiteral and clear TypeFlagsEnum.
-        return (t.flags & TypeFlags.Enum) >> 1 | t.flags & ~TypeFlags.Enum;
+        // Return TypeFlagsEnum for all enum-like unit types (they'll be sorted by their symbols)
+        if (t.flags & (TypeFlags.EnumLiteral | TypeFlags.Enum) && !(t.flags & TypeFlags.Union)) {
+            return TypeFlags.Enum;
+        }
+        return t.flags;
     }
 
     function compareTypeNames(t1: Type, t2: Type): number {

tests/baselines/reference/enumBasics.types

@@ -250,9 +250,9 @@ enum E9 {
 // (refer to .js to validate)
 // Enum constant members are propagated
 var doNotPropagate = [
->doNotPropagate : (E8 | E7 | E3 | E4)[]
+>doNotPropagate : (E7 | E8 | E3 | E4)[]
 >               : ^^^^^^^^^^^^^^^^^^^^^
->[    E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z] : (E8 | E7 | E3 | E4)[]
+>[    E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z] : (E7 | E8 | E3 | E4)[]
 >                                         : ^^^^^^^^^^^^^^^^^^^^^
 
     E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z

tests/baselines/reference/unknownType2.types

@@ -1048,15 +1048,15 @@ function notNotEquals(u: unknown)  {
 
     else {
         const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A  = u;
->aOrB : StringEnum.A | NumberEnum.A | NumberEnum.B
+>aOrB : NumberEnum.A | NumberEnum.B | StringEnum.A
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >NumberEnum : any
 >           : ^^^
 >NumberEnum : any
 >           : ^^^
 >StringEnum : any
 >           : ^^^
->u : StringEnum.A | NumberEnum.A | NumberEnum.B
+>u : NumberEnum.A | NumberEnum.B | StringEnum.A
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
 
@@ -1103,15 +1103,15 @@ function notNotEquals(u: unknown)  {
 
     else {
         const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A  = u;
->aOrB : StringEnum.A | NumberEnum.A | NumberEnum.B
+>aOrB : NumberEnum.A | NumberEnum.B | StringEnum.A
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >NumberEnum : any
 >           : ^^^
 >NumberEnum : any
 >           : ^^^
 >StringEnum : any
 >           : ^^^
->u : StringEnum.A | NumberEnum.A | NumberEnum.B
+>u : NumberEnum.A | NumberEnum.B | StringEnum.A
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     }
 }

tests/cases/fourslash/exhaustiveCaseCompletions1.ts

@@ -40,8 +40,8 @@ verify.completions(
                 sortText: completion.SortText.GlobalsOrKeywords,
                 insertText:
 `case 1:
-case E.B:
-case E.A:`,
+case E.A:
+case E.B:`,
             },
         ],
         preferences: {
@@ -53,13 +53,13 @@ case E.A:`,
         isNewIdentifierLocation: false,
         includes: [
             {
-                name: "case E.B: ...",
+                name: "case E.A: ...",
                 source: completion.CompletionSource.SwitchCases,
                 sortText: completion.SortText.GlobalsOrKeywords,
                 insertText:
-`case E.B:
-case E.C:
-case E.A:`,
+`case E.A:
+case E.B:
+case E.C:`,
             },
         ],
         preferences: {

tests/cases/fourslash/exhaustiveCaseCompletions2.ts

@@ -36,8 +36,8 @@ verify.completions(
                 sortText: completion.SortText.GlobalsOrKeywords,
                 insertText:
 `case 1:
-case E.B:
-case E.A:`,
+case E.A:
+case E.B:`,
                 hasAction: true,
             },
         ],
@@ -50,13 +50,13 @@ case E.A:`,
         isNewIdentifierLocation: false,
         includes: [
             {
-                name: "case d.E.B: ...",
+                name: "case d.E.A: ...",
                 source: completion.CompletionSource.SwitchCases,
                 sortText: completion.SortText.GlobalsOrKeywords,
                 insertText:
-`case d.E.B:
-case d.E.C:
-case d.E.A:`,
+`case d.E.A:
+case d.E.B:
+case d.E.C:`,
             },
         ],
         preferences: {

tests/cases/fourslash/exhaustiveCaseCompletions3.ts

@@ -35,13 +35,13 @@
 //// }
 
 const exhaustiveCaseCompletion = {
-    name: "case E.B: ...",
+    name: "case E.A: ...",
     source: completion.CompletionSource.SwitchCases,
     sortText: completion.SortText.GlobalsOrKeywords,
     insertText:
-`case E.B:
-case E.C:
-case E.A:`,
+`case E.A:
+case E.B:
+case E.C:`,
 };
 
 verify.completions(