microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 21:36:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Address code review

Browse Source
This commit is contained in:
Yui T
2015-03-16 15:41:51 -07:00
parent 88933d54cc
commit 91c5bae6e5
14 changed files with 134 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/compiler/emitter.ts
View File

@@ -4511,50 +4511,26 @@ module ts {
return emitPinnedOrTripleSlashComments(member);
}
}
if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
writeLine();
emitLeadingComments(member);
emitStart(member);
if (member.flags & NodeFlags.Static) {
write("static ");
}
if (member.kind === SyntaxKind.GetAccessor) {
write("get ");
}
else if (member.kind === SyntaxKind.SetAccessor) {
write("set ");
}
emit((<MethodDeclaration>member).name);
emitSignatureAndBody(<MethodDeclaration>member);
emitEnd(member);
emitTrailingComments(member);
}
else if (member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
var accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
if (member === accessors.firstAccessor) {
writeLine();
if (accessors.getAccessor) {
writeLine();
emitLeadingComments(accessors.getAccessor);
emitStart(accessors.getAccessor);
if (member.flags & NodeFlags.Static) {
write("static ");
}
write("get ");
emit((<MethodDeclaration>member).name);
emitSignatureAndBody(accessors.getAccessor);
emitEnd(accessors.getAccessor);
emitTrailingComments(accessors.getAccessor);
}
if (accessors.setAccessor) {
// We will only write new line if we just emit getAccessor
writeLine();
emitLeadingComments(accessors.setAccessor);
emitStart(accessors.setAccessor);
if (member.flags & NodeFlags.Static) {
write("static ");
}
write("set ");
emit((<MethodDeclaration>member).name);
emitSignatureAndBody(accessors.setAccessor);
emitEnd(accessors.setAccessor);
emitTrailingComments(accessors.setAccessor);;
}
}
}
});
}

21
tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js
View File

@@ -10,6 +10,17 @@ class C {
static get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
set ["computedname"](x: any) {
}
set ["computedname"](y: string) {
}
set foo(a: string) { }
static set bar(b: number) { }
@@ -27,6 +38,16 @@ class C {
static get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
set ["computedname"](x) {
}
set ["computedname"](y) {
}
set foo(a) {
}
static set bar(b) {

13
tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
View File

@@ -21,6 +21,19 @@ class C {
static get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
set ["computedname"](x: any) {
>x : any
}
set ["computedname"](y: string) {
>y : string
}
set foo(a: string) { }
>foo : string

37
tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.js Normal file
View File

@@ -0,0 +1,37 @@
//// [emitClassDeclarationWithLiteralPropertyNameInES6.ts]
class B {
"hello" = 10;
0b110 = "world";
0o23534 = "WORLD";
20 = "twenty";
"foo"() { }
0b1110() {}
11() { }
interface() { }
static "hi" = 10000;
static 22 = "twenty-two";
static 0b101 = "binary";
static 0o3235 = "octal";
}
//// [emitClassDeclarationWithLiteralPropertyNameInES6.js]
class B {
constructor() {
this["hello"] = 10;
this[0b110] = "world";
this[0o23534] = "WORLD";
this[20] = "twenty";
}
"foo"() {
}
0b1110() {
}
11() {
}
interface() {
}
}
B["hi"] = 10000;
B[22] = "twenty-two";
B[0b101] = "binary";
B[0o3235] = "octal";

19
tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types Normal file
View File

@@ -0,0 +1,19 @@
=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithLiteralPropertyNameInES6.ts ===
class B {
>B : B
"hello" = 10;
0b110 = "world";
0o23534 = "WORLD";
20 = "twenty";
"foo"() { }
0b1110() {}
11() { }
interface() { }
>interface : () => void
static "hi" = 10000;
static 22 = "twenty-two";
static 0b101 = "binary";
static 0o3235 = "octal";
}

4
tests/baselines/reference/emitClassDeclarationWithThisKeyword.js → tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.js
View File

@@ -1,4 +1,4 @@
//// [emitClassDeclarationWithThisKeyword.ts]
//// [emitClassDeclarationWithThisKeywordInES6.ts]
class B {
x = 10;
constructor() {
@@ -18,7 +18,7 @@ class B {
}
}
//// [emitClassDeclarationWithThisKeyword.js]
//// [emitClassDeclarationWithThisKeywordInES6.js]
class B {
constructor() {
this.x = 10;

2
tests/baselines/reference/emitClassDeclarationWithThisKeyword.types → tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.types
View File

@@ -1,4 +1,4 @@
=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithThisKeyword.ts ===
=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithThisKeywordInES6.ts ===
class B {
>B : B

4
tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverload.js → tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.js
View File

@@ -1,4 +1,4 @@
//// [emitClassDeclarationWithTypeArgumentAndOverload.ts]
//// [emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts]
class B<T> {
x: T;
B: T;
@@ -22,7 +22,7 @@ class B<T> {
}
}
//// [emitClassDeclarationWithTypeArgumentAndOverload.js]
//// [emitClassDeclarationWithTypeArgumentAndOverloadInES6.js]
class B {
constructor(a) {
this.B = a;

2
tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverload.types → tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.types
View File

@@ -1,4 +1,4 @@
=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverload.ts ===
=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts ===
class B<T> {
>B : B<T>
>T : T

3
tests/baselines/reference/symbolProperty44.js
View File

@@ -13,4 +13,7 @@ class C {
get [Symbol.hasInstance]() {
return "";
}
get [Symbol.hasInstance]() {
return "";
}
}

11
tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts
View File

@@ -10,6 +10,17 @@ class C {
static get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
get ["computedname"]() {
return "";
}
set ["computedname"](x: any) {
}
set ["computedname"](y: string) {
}
set foo(a: string) { }
static set bar(b: number) { }

15
tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithLiteralPropertyNameInES6.ts Normal file
View File

@@ -0,0 +1,15 @@
// @target: es6
class B {
"hello" = 10;
0b110 = "world";
0o23534 = "WORLD";
20 = "twenty";
"foo"() { }
0b1110() {}
11() { }
interface() { }
static "hi" = 10000;
static 22 = "twenty-two";
static 0b101 = "binary";
static 0o3235 = "octal";
}

0
tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithThisKeyword.ts → tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithThisKeywordInES6.ts
View File

0
tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverload.ts → tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts
View File