fix(46366): handle enum string access as enumMemberName (microsoft#46431)

a-tarasyuk · mprobst · commit b21afdc12320 · 2022-01-10T12:28:44.000+01:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -6223,12 +6223,8 @@ namespace ts {
                             firstChar = symbolName.charCodeAt(0);
                         }
                         let expression: Expression | undefined;
-                        if (isSingleOrDoubleQuote(firstChar)) {
-                            expression = factory.createStringLiteral(
-                                symbolName
-                                    .substring(1, symbolName.length - 1)
-                                    .replace(/\\./g, s => s.substring(1)),
-                                firstChar === CharacterCodes.singleQuote);
+                        if (isSingleOrDoubleQuote(firstChar) && !(symbol.flags & SymbolFlags.EnumMember)) {
+                           expression = factory.createStringLiteral(stripQuotes(symbolName).replace(/\\./g, s => s.substring(1)), firstChar === CharacterCodes.singleQuote);
                         }
                         else if (("" + +symbolName) === symbolName) {
                             expression = factory.createNumericLiteral(+symbolName);
diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.symbols b/tests/baselines/reference/enumWithUnicodeEscape1.symbols
@@ -3,6 +3,6 @@ enum E {
 >E : Symbol(E, Decl(enumWithUnicodeEscape1.ts, 0, 0))
 
   'gold \u2730'
->'gold \u2730' : Symbol(E['gold u2730'], Decl(enumWithUnicodeEscape1.ts, 0, 8))
+>'gold \u2730' : Symbol(E['gold \u2730'], Decl(enumWithUnicodeEscape1.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline b/tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline
@@ -69,7 +69,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -135,7 +135,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -201,7 +201,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -411,7 +411,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -549,7 +549,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -687,7 +687,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -791,7 +791,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -857,7 +857,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -923,7 +923,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -1149,7 +1149,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -1295,7 +1295,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -1441,7 +1441,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
diff --git a/tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline b/tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline
@@ -69,7 +69,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -135,7 +135,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -201,7 +201,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -411,7 +411,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -549,7 +549,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -687,7 +687,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -791,7 +791,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -857,7 +857,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -923,7 +923,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -1149,7 +1149,7 @@
         },
         {
           "text": "\"e1\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -1295,7 +1295,7 @@
         },
         {
           "text": "'e2'",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
@@ -1441,7 +1441,7 @@
         },
         {
           "text": "\"e3\"",
-          "kind": "stringLiteral"
+          "kind": "enumMemberName"
         },
         {
           "text": "]",
diff --git a/tests/baselines/reference/quickInfoDisplayPartsEnum4.baseline b/tests/baselines/reference/quickInfoDisplayPartsEnum4.baseline
@@ -0,0 +1,134 @@
+[
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/quickInfoDisplayPartsEnum4.ts",
+      "position": 51,
+      "name": "1"
+    },
+    "quickInfo": {
+      "kind": "enum member",
+      "kindModifiers": "",
+      "textSpan": {
+        "start": 51,
+        "length": 4
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "enum member",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "Foo",
+          "kind": "enumName"
+        },
+        {
+          "text": "[",
+          "kind": "punctuation"
+        },
+        {
+          "text": "\"\\t\"",
+          "kind": "enumMemberName"
+        },
+        {
+          "text": "]",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=",
+          "kind": "operator"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "9",
+          "kind": "numericLiteral"
+        }
+      ],
+      "documentation": []
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/quickInfoDisplayPartsEnum4.ts",
+      "position": 61,
+      "name": "2"
+    },
+    "quickInfo": {
+      "kind": "enum member",
+      "kindModifiers": "",
+      "textSpan": {
+        "start": 61,
+        "length": 8
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "enum member",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "Foo",
+          "kind": "enumName"
+        },
+        {
+          "text": "[",
+          "kind": "punctuation"
+        },
+        {
+          "text": "\"\\u007f\"",
+          "kind": "enumMemberName"
+        },
+        {
+          "text": "]",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=",
+          "kind": "operator"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "127",
+          "kind": "numericLiteral"
+        }
+      ],
+      "documentation": []
+    }
+  }
+]
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsEnum4.ts b/tests/cases/fourslash/quickInfoDisplayPartsEnum4.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts'/>
+
+////const enum Foo {
+////	"\t" = 9,
+////	"\u007f" = 127,
+////}
+////Foo[/*1*/"\t"]
+////Foo[/*2*/"\u007f"]
+
+verify.baselineQuickInfo();

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ enum E {`
`3`	`3`	`>E : Symbol(E, Decl(enumWithUnicodeEscape1.ts, 0, 0))`
`4`	`4`
`5`	`5`	`'gold \u2730'`
`6`		`->'gold \u2730' : Symbol(E['gold u2730'], Decl(enumWithUnicodeEscape1.ts, 0, 8))`
	`6`	`+>'gold \u2730' : Symbol(E['gold \u2730'], Decl(enumWithUnicodeEscape1.ts, 0, 8))`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`},`
`70`	`70`	`{`
`71`	`71`	`"text": "\"e1\"",`
`72`		`- "kind": "stringLiteral"`
	`72`	`+ "kind": "enumMemberName"`
`73`	`73`	`},`
`74`	`74`	`{`
`75`	`75`	`"text": "]",`
`@@ -135,7 +135,7 @@`
`135`	`135`	`},`
`136`	`136`	`{`
`137`	`137`	`"text": "'e2'",`
`138`		`- "kind": "stringLiteral"`
	`138`	`+ "kind": "enumMemberName"`
`139`	`139`	`},`
`140`	`140`	`{`
`141`	`141`	`"text": "]",`
`@@ -201,7 +201,7 @@`
`201`	`201`	`},`
`202`	`202`	`{`
`203`	`203`	`"text": "\"e3\"",`
`204`		`- "kind": "stringLiteral"`
	`204`	`+ "kind": "enumMemberName"`
`205`	`205`	`},`
`206`	`206`	`{`
`207`	`207`	`"text": "]",`
`@@ -411,7 +411,7 @@`
`411`	`411`	`},`
`412`	`412`	`{`
`413`	`413`	`"text": "\"e1\"",`
`414`		`- "kind": "stringLiteral"`
	`414`	`+ "kind": "enumMemberName"`
`415`	`415`	`},`
`416`	`416`	`{`
`417`	`417`	`"text": "]",`
`@@ -549,7 +549,7 @@`
`549`	`549`	`},`
`550`	`550`	`{`
`551`	`551`	`"text": "'e2'",`
`552`		`- "kind": "stringLiteral"`
	`552`	`+ "kind": "enumMemberName"`
`553`	`553`	`},`
`554`	`554`	`{`
`555`	`555`	`"text": "]",`
`@@ -687,7 +687,7 @@`
`687`	`687`	`},`
`688`	`688`	`{`
`689`	`689`	`"text": "\"e3\"",`
`690`		`- "kind": "stringLiteral"`
	`690`	`+ "kind": "enumMemberName"`
`691`	`691`	`},`
`692`	`692`	`{`
`693`	`693`	`"text": "]",`
`@@ -791,7 +791,7 @@`
`791`	`791`	`},`
`792`	`792`	`{`
`793`	`793`	`"text": "\"e1\"",`
`794`		`- "kind": "stringLiteral"`
	`794`	`+ "kind": "enumMemberName"`
`795`	`795`	`},`
`796`	`796`	`{`
`797`	`797`	`"text": "]",`
`@@ -857,7 +857,7 @@`
`857`	`857`	`},`
`858`	`858`	`{`
`859`	`859`	`"text": "'e2'",`
`860`		`- "kind": "stringLiteral"`
	`860`	`+ "kind": "enumMemberName"`
`861`	`861`	`},`
`862`	`862`	`{`
`863`	`863`	`"text": "]",`
`@@ -923,7 +923,7 @@`
`923`	`923`	`},`
`924`	`924`	`{`
`925`	`925`	`"text": "\"e3\"",`
`926`		`- "kind": "stringLiteral"`
	`926`	`+ "kind": "enumMemberName"`
`927`	`927`	`},`
`928`	`928`	`{`
`929`	`929`	`"text": "]",`
`@@ -1149,7 +1149,7 @@`
`1149`	`1149`	`},`
`1150`	`1150`	`{`
`1151`	`1151`	`"text": "\"e1\"",`
`1152`		`- "kind": "stringLiteral"`
	`1152`	`+ "kind": "enumMemberName"`
`1153`	`1153`	`},`
`1154`	`1154`	`{`
`1155`	`1155`	`"text": "]",`
`@@ -1295,7 +1295,7 @@`
`1295`	`1295`	`},`
`1296`	`1296`	`{`
`1297`	`1297`	`"text": "'e2'",`
`1298`		`- "kind": "stringLiteral"`
	`1298`	`+ "kind": "enumMemberName"`
`1299`	`1299`	`},`
`1300`	`1300`	`{`
`1301`	`1301`	`"text": "]",`
`@@ -1441,7 +1441,7 @@`
`1441`	`1441`	`},`
`1442`	`1442`	`{`
`1443`	`1443`	`"text": "\"e3\"",`
`1444`		`- "kind": "stringLiteral"`
	`1444`	`+ "kind": "enumMemberName"`
`1445`	`1445`	`},`
`1446`	`1446`	`{`
`1447`	`1447`	`"text": "]",`