Set ScriptElementKind for enum members to "enum member" instead of "const"

Andy Hanson · Andy Hanson · commit 1c080d11e644 · 2017-02-14T06:35:49.000-08:00
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -701,8 +701,7 @@ namespace ts {
 
         /** enum E */
         export const enumElement = "enum";
-        // TODO: GH#9983
-        export const enumMemberElement = "const";
+        export const enumMemberElement = "enum member";
 
         /**
          * Inside module and script only
diff --git a/tests/cases/fourslash/deleteClassWithEnumPresent.ts b/tests/cases/fourslash/deleteClassWithEnumPresent.ts
@@ -16,15 +16,15 @@ verify.navigationTree({
             "childItems": [
                 {
                     "text": "a",
-                    "kind": "const"
+                    "kind": "enum member"
                 },
                 {
                     "text": "b",
-                    "kind": "const"
+                    "kind": "enum member"
                 },
                 {
                     "text": "c",
-                    "kind": "const"
+                    "kind": "enum member"
                 }
             ]
         }
@@ -48,15 +48,15 @@ verify.navigationBar([
         "childItems": [
             {
                 "text": "a",
-                "kind": "const"
+                "kind": "enum member"
             },
             {
                 "text": "b",
-                "kind": "const"
+                "kind": "enum member"
             },
             {
                 "text": "c",
-                "kind": "const"
+                "kind": "enum member"
             }
         ],
         "indent": 1
diff --git a/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts b/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
@@ -36,7 +36,7 @@ verify.navigationTree({
                             "childItems": [
                                 {
                                     "text": "LocalEnumMemberInConstructor",
-                                    "kind": "const"
+                                    "kind": "enum member"
                                 }
                             ]
                         },
@@ -64,7 +64,7 @@ verify.navigationTree({
                             "childItems": [
                                 {
                                     "text": "LocalEnumMemberInMethod",
-                                    "kind": "const"
+                                    "kind": "enum member"
                                 }
                             ]
                         },
@@ -144,7 +144,7 @@ verify.navigationBar([
         "childItems": [
             {
                 "text": "LocalEnumMemberInConstructor",
-                "kind": "const"
+                "kind": "enum member"
             }
         ],
         "indent": 3
@@ -184,7 +184,7 @@ verify.navigationBar([
         "childItems": [
             {
                 "text": "LocalEnumMemberInMethod",
-                "kind": "const"
+                "kind": "enum member"
             }
         ],
         "indent": 3
diff --git a/tests/cases/fourslash/navigationBarItemsItems.ts b/tests/cases/fourslash/navigationBarItemsItems.ts
@@ -130,15 +130,15 @@ verify.navigationTree({
                     "childItems": [
                         {
                             "text": "value1",
-                            "kind": "const"
+                            "kind": "enum member"
                         },
                         {
                             "text": "value2",
-                            "kind": "const"
+                            "kind": "enum member"
                         },
                         {
                             "text": "value3",
-                            "kind": "const"
+                            "kind": "enum member"
                         }
                     ]
                 }
@@ -263,15 +263,15 @@ verify.navigationBar([
         "childItems": [
             {
                 "text": "value1",
-                "kind": "const"
+                "kind": "enum member"
             },
             {
                 "text": "value2",
-                "kind": "const"
+                "kind": "enum member"
             },
             {
                 "text": "value3",
-                "kind": "const"
+                "kind": "enum member"
             }
         ],
         "indent": 2
diff --git a/tests/cases/fourslash/server/navbar01.ts b/tests/cases/fourslash/server/navbar01.ts
@@ -129,15 +129,15 @@ verify.navigationTree({
                     "childItems": [
                         {
                             "text": "value1",
-                            "kind": "const"
+                            "kind": "enum member"
                         },
                         {
                             "text": "value2",
-                            "kind": "const"
+                            "kind": "enum member"
                         },
                         {
                             "text": "value3",
-                            "kind": "const"
+                            "kind": "enum member"
                         }
                     ]
                 }
@@ -262,15 +262,15 @@ verify.navigationBar([
         "childItems": [
             {
                 "text": "value1",
-                "kind": "const"
+                "kind": "enum member"
             },
             {
                 "text": "value2",
-                "kind": "const"
+                "kind": "enum member"
             },
             {
                 "text": "value3",
-                "kind": "const"
+                "kind": "enum member"
             }
         ],
         "indent": 2

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ verify.navigationTree({`
`16`	`16`	`"childItems": [`
`17`	`17`	`{`
`18`	`18`	`"text": "a",`
`19`		`- "kind": "const"`
	`19`	`+ "kind": "enum member"`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`"text": "b",`
`23`		`- "kind": "const"`
	`23`	`+ "kind": "enum member"`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`"text": "c",`
`27`		`- "kind": "const"`
	`27`	`+ "kind": "enum member"`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`}`
`@@ -48,15 +48,15 @@ verify.navigationBar([`
`48`	`48`	`"childItems": [`
`49`	`49`	`{`
`50`	`50`	`"text": "a",`
`51`		`- "kind": "const"`
	`51`	`+ "kind": "enum member"`
`52`	`52`	`},`
`53`	`53`	`{`
`54`	`54`	`"text": "b",`
`55`		`- "kind": "const"`
	`55`	`+ "kind": "enum member"`
`56`	`56`	`},`
`57`	`57`	`{`
`58`	`58`	`"text": "c",`
`59`		`- "kind": "const"`
	`59`	`+ "kind": "enum member"`
`60`	`60`	`}`
`61`	`61`	`],`
`62`	`62`	`"indent": 1`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ verify.navigationTree({`
`36`	`36`	`"childItems": [`
`37`	`37`	`{`
`38`	`38`	`"text": "LocalEnumMemberInConstructor",`
`39`		`- "kind": "const"`
	`39`	`+ "kind": "enum member"`
`40`	`40`	`}`
`41`	`41`	`]`
`42`	`42`	`},`
`@@ -64,7 +64,7 @@ verify.navigationTree({`
`64`	`64`	`"childItems": [`
`65`	`65`	`{`
`66`	`66`	`"text": "LocalEnumMemberInMethod",`
`67`		`- "kind": "const"`
	`67`	`+ "kind": "enum member"`
`68`	`68`	`}`
`69`	`69`	`]`
`70`	`70`	`},`
`@@ -144,7 +144,7 @@ verify.navigationBar([`
`144`	`144`	`"childItems": [`
`145`	`145`	`{`
`146`	`146`	`"text": "LocalEnumMemberInConstructor",`
`147`		`- "kind": "const"`
	`147`	`+ "kind": "enum member"`
`148`	`148`	`}`
`149`	`149`	`],`
`150`	`150`	`"indent": 3`
`@@ -184,7 +184,7 @@ verify.navigationBar([`
`184`	`184`	`"childItems": [`
`185`	`185`	`{`
`186`	`186`	`"text": "LocalEnumMemberInMethod",`
`187`		`- "kind": "const"`
	`187`	`+ "kind": "enum member"`
`188`	`188`	`}`
`189`	`189`	`],`
`190`	`190`	`"indent": 3`
Original file line number	Diff line number	Diff line change
`@@ -130,15 +130,15 @@ verify.navigationTree({`
`130`	`130`	`"childItems": [`
`131`	`131`	`{`
`132`	`132`	`"text": "value1",`
`133`		`- "kind": "const"`
	`133`	`+ "kind": "enum member"`
`134`	`134`	`},`
`135`	`135`	`{`
`136`	`136`	`"text": "value2",`
`137`		`- "kind": "const"`
	`137`	`+ "kind": "enum member"`
`138`	`138`	`},`
`139`	`139`	`{`
`140`	`140`	`"text": "value3",`
`141`		`- "kind": "const"`
	`141`	`+ "kind": "enum member"`
`142`	`142`	`}`
`143`	`143`	`]`
`144`	`144`	`}`
`@@ -263,15 +263,15 @@ verify.navigationBar([`
`263`	`263`	`"childItems": [`
`264`	`264`	`{`
`265`	`265`	`"text": "value1",`
`266`		`- "kind": "const"`
	`266`	`+ "kind": "enum member"`
`267`	`267`	`},`
`268`	`268`	`{`
`269`	`269`	`"text": "value2",`
`270`		`- "kind": "const"`
	`270`	`+ "kind": "enum member"`
`271`	`271`	`},`
`272`	`272`	`{`
`273`	`273`	`"text": "value3",`
`274`		`- "kind": "const"`
	`274`	`+ "kind": "enum member"`
`275`	`275`	`}`
`276`	`276`	`],`
`277`	`277`	`"indent": 2`
Original file line number	Diff line number	Diff line change
`@@ -129,15 +129,15 @@ verify.navigationTree({`
`129`	`129`	`"childItems": [`
`130`	`130`	`{`
`131`	`131`	`"text": "value1",`
`132`		`- "kind": "const"`
	`132`	`+ "kind": "enum member"`
`133`	`133`	`},`
`134`	`134`	`{`
`135`	`135`	`"text": "value2",`
`136`		`- "kind": "const"`
	`136`	`+ "kind": "enum member"`
`137`	`137`	`},`
`138`	`138`	`{`
`139`	`139`	`"text": "value3",`
`140`		`- "kind": "const"`
	`140`	`+ "kind": "enum member"`
`141`	`141`	`}`
`142`	`142`	`]`
`143`	`143`	`}`
`@@ -262,15 +262,15 @@ verify.navigationBar([`
`262`	`262`	`"childItems": [`
`263`	`263`	`{`
`264`	`264`	`"text": "value1",`
`265`		`- "kind": "const"`
	`265`	`+ "kind": "enum member"`
`266`	`266`	`},`
`267`	`267`	`{`
`268`	`268`	`"text": "value2",`
`269`		`- "kind": "const"`
	`269`	`+ "kind": "enum member"`
`270`	`270`	`},`
`271`	`271`	`{`
`272`	`272`	`"text": "value3",`
`273`		`- "kind": "const"`
	`273`	`+ "kind": "enum member"`
`274`	`274`	`}`
`275`	`275`	`],`
`276`	`276`	`"indent": 2`