Escape string literal before looking it up in enum's symbol table (microsoft#17441)

Andy · web-flow · commit cc8399dc41ca · 2017-07-26T16:00:34.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -21517,7 +21517,7 @@ namespace ts {
                                 else {
                                     const argument = ex.argumentExpression;
                                     Debug.assert(isLiteralExpression(argument));
-                                    name = (argument as LiteralExpression).text as __String; // TODO: GH#17348
+                                    name = escapeLeadingUnderscores((argument as LiteralExpression).text);
                                 }
                                 return evaluateEnumMember(expr, type.symbol, name);
                             }
diff --git a/tests/baselines/reference/underscoreEscapedNameInEnum.js b/tests/baselines/reference/underscoreEscapedNameInEnum.js
@@ -0,0 +1,13 @@
+//// [underscoreEscapedNameInEnum.ts]
+enum E {
+    "__foo" = 1,
+    bar = E["__foo"] + 1
+}
+
+
+//// [underscoreEscapedNameInEnum.js]
+var E;
+(function (E) {
+    E[E["__foo"] = 1] = "__foo";
+    E[E["bar"] = 2] = "bar";
+})(E || (E = {}));
diff --git a/tests/baselines/reference/underscoreEscapedNameInEnum.symbols b/tests/baselines/reference/underscoreEscapedNameInEnum.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/underscoreEscapedNameInEnum.ts ===
+enum E {
+>E : Symbol(E, Decl(underscoreEscapedNameInEnum.ts, 0, 0))
+
+    "__foo" = 1,
+    bar = E["__foo"] + 1
+>bar : Symbol(E.bar, Decl(underscoreEscapedNameInEnum.ts, 1, 16))
+>E : Symbol(E, Decl(underscoreEscapedNameInEnum.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/underscoreEscapedNameInEnum.types b/tests/baselines/reference/underscoreEscapedNameInEnum.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/underscoreEscapedNameInEnum.ts ===
+enum E {
+>E : E
+
+    "__foo" = 1,
+>1 : 1
+
+    bar = E["__foo"] + 1
+>bar : E
+>E["__foo"] + 1 : number
+>E["__foo"] : E
+>E : typeof E
+>"__foo" : "__foo"
+>1 : 1
+}
+
diff --git a/tests/cases/compiler/underscoreEscapedNameInEnum.ts b/tests/cases/compiler/underscoreEscapedNameInEnum.ts
@@ -0,0 +1,4 @@
+enum E {
+    "__foo" = 1,
+    bar = E["__foo"] + 1
+}

Original file line number	Diff line number	Diff line change
`@@ -21517,7 +21517,7 @@ namespace ts {`
`21517`	`21517`	`else {`
`21518`	`21518`	`const argument = ex.argumentExpression;`
`21519`	`21519`	`Debug.assert(isLiteralExpression(argument));`
`21520`		`- name = (argument as LiteralExpression).text as __String; // TODO: GH#17348`
	`21520`	`+ name = escapeLeadingUnderscores((argument as LiteralExpression).text);`
`21521`	`21521`	`}`
`21522`	`21522`	`return evaluateEnumMember(expr, type.symbol, name);`
`21523`	`21523`	`}`