Merge pull request #4507 from Microsoft/port-4474

Port PR 4474 into release-1.6

src/compiler/checker.ts

@@ -13053,7 +13053,7 @@ namespace ts {
                             // illegal case: forward reference
                             if (!isDefinedBefore(propertyDecl, member)) {
                                 reportError = false;
-                                error(e, Diagnostics.A_member_initializer_in_a_const_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_const_enums);
+                                error(e, Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
                                 return undefined;
                             }
 

src/compiler/diagnosticInformationMap.generated.ts

@@ -425,7 +425,7 @@ namespace ts {
         JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: DiagnosticCategory.Error, key: "JSX element class does not support attributes because it does not have a '{0}' property" },
         The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: DiagnosticCategory.Error, key: "The global type 'JSX.{0}' may not have more than one property" },
         Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: DiagnosticCategory.Error, key: "Cannot emit namespaced JSX elements in React" },
-        A_member_initializer_in_a_const_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_const_enums: { code: 2651, category: DiagnosticCategory.Error, key: "A member initializer in a 'const' enum declaration cannot reference members declared after it, including members defined in other 'const' enums." },
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: DiagnosticCategory.Error, key: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: DiagnosticCategory.Error, key: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },

src/compiler/diagnosticMessages.json

@@ -1689,7 +1689,7 @@
         "category": "Error",
         "code": 2650
     },
-    "A member initializer in a 'const' enum declaration cannot reference members declared after it, including members defined in other 'const' enums.": {
+    "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.": {
         "category": "Error",
         "code": 2651
     },    

tests/baselines/reference/constEnumErrors.errors.txt

@@ -1,6 +1,6 @@
 tests/cases/compiler/constEnumErrors.ts(1,12): error TS2300: Duplicate identifier 'E'.
 tests/cases/compiler/constEnumErrors.ts(5,8): error TS2300: Duplicate identifier 'E'.
-tests/cases/compiler/constEnumErrors.ts(12,9): error TS2651: A member initializer in a 'const' enum declaration cannot reference members declared after it, including members defined in other 'const' enums.
+tests/cases/compiler/constEnumErrors.ts(12,9): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
 tests/cases/compiler/constEnumErrors.ts(14,9): error TS2474: In 'const' enum declarations member initializer must be constant expression.
 tests/cases/compiler/constEnumErrors.ts(15,10): error TS2474: In 'const' enum declarations member initializer must be constant expression.
 tests/cases/compiler/constEnumErrors.ts(22,13): error TS2476: A const enum member can only be accessed using a string literal.
@@ -31,7 +31,7 @@ tests/cases/compiler/constEnumErrors.ts(42,9): error TS2478: 'const' enum member
         // forward reference to the element of the same enum
         X = Y, 
             ~
-!!! error TS2651: A member initializer in a 'const' enum declaration cannot reference members declared after it, including members defined in other 'const' enums.
+!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
         // forward reference to the element of the same enum
         Y = E1.Z,
             ~~~~

tests/baselines/reference/forwardRefInEnum.errors.txt

@@ -0,0 +1,29 @@
+tests/cases/compiler/forwardRefInEnum.ts(4,9): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+tests/cases/compiler/forwardRefInEnum.ts(5,10): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+tests/cases/compiler/forwardRefInEnum.ts(7,9): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+tests/cases/compiler/forwardRefInEnum.ts(8,10): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+
+
+==== tests/cases/compiler/forwardRefInEnum.ts (4 errors) ====
+    enum E1 {
+        // illegal case
+        // forward reference to the element of the same enum
+        X = Y, 
+            ~
+!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+        X1 = E1["Y"], 
+             ~~~~~~~
+!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+        // forward reference to the element of the same enum
+        Y = E1.Z,
+            ~~~~
+!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+        Y1 = E1["Z"]
+             ~~~~~~~
+!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
+    }
+    
+    enum E1 {
+        Z = 4    
+    }
+    

tests/baselines/reference/forwardRefInEnum.js

@@ -0,0 +1,31 @@
+//// [forwardRefInEnum.ts]
+enum E1 {
+    // illegal case
+    // forward reference to the element of the same enum
+    X = Y, 
+    X1 = E1["Y"], 
+    // forward reference to the element of the same enum
+    Y = E1.Z,
+    Y1 = E1["Z"]
+}
+
+enum E1 {
+    Z = 4    
+}
+
+
+//// [forwardRefInEnum.js]
+var E1;
+(function (E1) {
+    // illegal case
+    // forward reference to the element of the same enum
+    E1[E1["X"] = E1.Y] = "X";
+    E1[E1["X1"] = E1["Y"]] = "X1";
+    // forward reference to the element of the same enum
+    E1[E1["Y"] = E1.Z] = "Y";
+    E1[E1["Y1"] = E1["Z"]] = "Y1";
+})(E1 || (E1 = {}));
+var E1;
+(function (E1) {
+    E1[E1["Z"] = 4] = "Z";
+})(E1 || (E1 = {}));

tests/cases/compiler/forwardRefInEnum.ts

@@ -0,0 +1,13 @@
+enum E1 {
+    // illegal case
+    // forward reference to the element of the same enum
+    X = Y, 
+    X1 = E1["Y"], 
+    // forward reference to the element of the same enum
+    Y = E1.Z,
+    Y1 = E1["Z"]
+}
+
+enum E1 {
+    Z = 4    
+}