Skip to content

allow string concat in enum member declaration #21476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2018
Merged

allow string concat in enum member declaration #21476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2455405
allow string concat in enum member declaration
Jan 30, 2018
1e1b728
accept baseline
Kingwl Apr 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5277,6 +5277,16 @@ namespace ts {
return links.declaredType;
}

function isStringConcatExpression(expr: Node): boolean {
if (expr.kind === SyntaxKind.StringLiteral) {
return true;
}
else if (expr.kind === SyntaxKind.BinaryExpression) {
return isStringConcatExpression((<BinaryExpression>expr).left) && isStringConcatExpression((<BinaryExpression>expr).right);
}
return false;
}

function isLiteralEnumMember(member: EnumMember) {
const expr = member.initializer;
if (!expr) {
Expand All @@ -5291,6 +5301,8 @@ namespace ts {
(<PrefixUnaryExpression>expr).operand.kind === SyntaxKind.NumericLiteral;
case SyntaxKind.Identifier:
return nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get((<Identifier>expr).escapedText);
case SyntaxKind.BinaryExpression:
return isStringConcatExpression(expr);
default:
return false;
}
Expand Down Expand Up @@ -24064,6 +24076,9 @@ namespace ts {
case SyntaxKind.AsteriskAsteriskToken: return left ** right;
}
}
else if (typeof left === "string" && typeof right === "string" && (<BinaryExpression>expr).operatorToken.kind === SyntaxKind.PlusToken) {
return left + right;
}
break;
case SyntaxKind.StringLiteral:
return (<StringLiteral>expr).text;
Expand Down
45 changes: 45 additions & 0 deletions tests/baselines/reference/enumConstantMemberWithString.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
tests/cases/conformance/enums/enumConstantMemberWithString.ts(5,9): error TS2553: Computed values are not permitted in an enum with string valued members.
tests/cases/conformance/enums/enumConstantMemberWithString.ts(6,9): error TS2553: Computed values are not permitted in an enum with string valued members.
tests/cases/conformance/enums/enumConstantMemberWithString.ts(18,9): error TS2553: Computed values are not permitted in an enum with string valued members.


==== tests/cases/conformance/enums/enumConstantMemberWithString.ts (3 errors) ====
enum T1 {
a = "1",
b = "1" + "2",
c = "1" + "2" + "3",
d = "a" - "a",
~~~~~~~~~
!!! error TS2553: Computed values are not permitted in an enum with string valued members.
e = "a" + 1
~~~~~~~
!!! error TS2553: Computed values are not permitted in an enum with string valued members.
}

enum T2 {
a = "1",
b = "1" + "2"
}

enum T3 {
a = "1",
b = "1" + "2",
c = 1,
d = 1 + 2
~~~~~
!!! error TS2553: Computed values are not permitted in an enum with string valued members.
}

enum T4 {
a = "1"
}

enum T5 {
a = "1" + "2"
}

declare enum T6 {
a = "1",
b = "1" + "2"
}

64 changes: 64 additions & 0 deletions tests/baselines/reference/enumConstantMemberWithString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
//// [enumConstantMemberWithString.ts]
enum T1 {
a = "1",
b = "1" + "2",
c = "1" + "2" + "3",
d = "a" - "a",
e = "a" + 1
}

enum T2 {
a = "1",
b = "1" + "2"
}

enum T3 {
a = "1",
b = "1" + "2",
c = 1,
d = 1 + 2
}

enum T4 {
a = "1"
}

enum T5 {
a = "1" + "2"
}

declare enum T6 {
a = "1",
b = "1" + "2"
}


//// [enumConstantMemberWithString.js]
var T1;
(function (T1) {
T1["a"] = "1";
T1["b"] = "12";
T1["c"] = "123";
T1[T1["d"] = 0] = "d";
T1[T1["e"] = 0] = "e";
})(T1 || (T1 = {}));
var T2;
(function (T2) {
T2["a"] = "1";
T2["b"] = "12";
})(T2 || (T2 = {}));
var T3;
(function (T3) {
T3["a"] = "1";
T3["b"] = "12";
T3[T3["c"] = 1] = "c";
T3[T3["d"] = 0] = "d";
})(T3 || (T3 = {}));
var T4;
(function (T4) {
T4["a"] = "1";
})(T4 || (T4 = {}));
var T5;
(function (T5) {
T5["a"] = "12";
})(T5 || (T5 = {}));
70 changes: 70 additions & 0 deletions tests/baselines/reference/enumConstantMemberWithString.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
=== tests/cases/conformance/enums/enumConstantMemberWithString.ts ===
enum T1 {
>T1 : Symbol(T1, Decl(enumConstantMemberWithString.ts, 0, 0))

a = "1",
>a : Symbol(T1.a, Decl(enumConstantMemberWithString.ts, 0, 9))

b = "1" + "2",
>b : Symbol(T1.b, Decl(enumConstantMemberWithString.ts, 1, 12))

c = "1" + "2" + "3",
>c : Symbol(T1.c, Decl(enumConstantMemberWithString.ts, 2, 18))

d = "a" - "a",
>d : Symbol(T1.d, Decl(enumConstantMemberWithString.ts, 3, 24))

e = "a" + 1
>e : Symbol(T1.e, Decl(enumConstantMemberWithString.ts, 4, 18))
}

enum T2 {
>T2 : Symbol(T2, Decl(enumConstantMemberWithString.ts, 6, 1))

a = "1",
>a : Symbol(T2.a, Decl(enumConstantMemberWithString.ts, 8, 9))

b = "1" + "2"
>b : Symbol(T2.b, Decl(enumConstantMemberWithString.ts, 9, 12))
}

enum T3 {
>T3 : Symbol(T3, Decl(enumConstantMemberWithString.ts, 11, 1))

a = "1",
>a : Symbol(T3.a, Decl(enumConstantMemberWithString.ts, 13, 9))

b = "1" + "2",
>b : Symbol(T3.b, Decl(enumConstantMemberWithString.ts, 14, 12))

c = 1,
>c : Symbol(T3.c, Decl(enumConstantMemberWithString.ts, 15, 18))

d = 1 + 2
>d : Symbol(T3.d, Decl(enumConstantMemberWithString.ts, 16, 10))
}

enum T4 {
>T4 : Symbol(T4, Decl(enumConstantMemberWithString.ts, 18, 1))

a = "1"
>a : Symbol(T4.a, Decl(enumConstantMemberWithString.ts, 20, 9))
}

enum T5 {
>T5 : Symbol(T5, Decl(enumConstantMemberWithString.ts, 22, 1))

a = "1" + "2"
>a : Symbol(T5.a, Decl(enumConstantMemberWithString.ts, 24, 9))
}

declare enum T6 {
>T6 : Symbol(T6, Decl(enumConstantMemberWithString.ts, 26, 1))

a = "1",
>a : Symbol(T6.a, Decl(enumConstantMemberWithString.ts, 28, 17))

b = "1" + "2"
>b : Symbol(T6.b, Decl(enumConstantMemberWithString.ts, 29, 12))
}

105 changes: 105 additions & 0 deletions tests/baselines/reference/enumConstantMemberWithString.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
=== tests/cases/conformance/enums/enumConstantMemberWithString.ts ===
enum T1 {
>T1 : T1

a = "1",
>a : T1.a
>"1" : "1"

b = "1" + "2",
>b : T1.b
>"1" + "2" : string
>"1" : "1"
>"2" : "2"

c = "1" + "2" + "3",
>c : T1.c
>"1" + "2" + "3" : string
>"1" + "2" : string
>"1" : "1"
>"2" : "2"
>"3" : "3"

d = "a" - "a",
>d : T1.d
>"a" - "a" : number
>"a" : "a"
>"a" : "a"

e = "a" + 1
>e : T1.d
>"a" + 1 : string
>"a" : "a"
>1 : 1
}

enum T2 {
>T2 : T2

a = "1",
>a : T2.a
>"1" : "1"

b = "1" + "2"
>b : T2.b
>"1" + "2" : string
>"1" : "1"
>"2" : "2"
}

enum T3 {
>T3 : T3

a = "1",
>a : T3.a
>"1" : "1"

b = "1" + "2",
>b : T3.b
>"1" + "2" : string
>"1" : "1"
>"2" : "2"

c = 1,
>c : T3.c
>1 : 1

d = 1 + 2
>d : T3.d
>1 + 2 : number
>1 : 1
>2 : 2
}

enum T4 {
>T4 : T4

a = "1"
>a : T4
>"1" : "1"
}

enum T5 {
>T5 : T5

a = "1" + "2"
>a : T5
>"1" + "2" : string
>"1" : "1"
>"2" : "2"
}

declare enum T6 {
>T6 : T6

a = "1",
>a : T6.a
>"1" : "1"

b = "1" + "2"
>b : T6.b
>"1" + "2" : string
>"1" : "1"
>"2" : "2"
}

Loading