Emit class declaration with static property assignment

Author: Yui T

src/compiler/emitter.ts

@@ -4677,10 +4677,17 @@ module ts {
                 writeLine();
                 emitConstructorOfClass(node, baseTypeNode);
                 emitMemberFunctionsAboveES6(node);
+                decreaseIndent();
                 writeLine();
+                emitToken(SyntaxKind.CloseBraceToken, node.members.end);
                 scopeEmitEnd();
-                decreaseIndent();
-                write("}");
+
+                // Emit static property assignment. Because classDeclaration is lexically evaluated, it is safe to emit static property assignment after classDeclaration
+                // From ES6 specification:
+                //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+                //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+                writeLine();
+                emitMemberAssignments(node, NodeFlags.Static);
             }
 
             function emitClassDeclarationBelowES6(node: ClassDeclaration) {

tests/baselines/reference/emitClassDeclarationWithConstructorPropertyAssignmentInES6.js renamed to tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.js

@@ -1,4 +1,4 @@
-//// [emitClassDeclarationWithConstructorPropertyAssignmentInES6.ts]
+//// [emitClassDeclarationWithPropertyAssignmentInES6.ts]
 class C {
     x: string = "Hello world";
 }
@@ -24,7 +24,7 @@ class F extends D{
     }
 }
 
-//// [emitClassDeclarationWithConstructorPropertyAssignmentInES6.js]
+//// [emitClassDeclarationWithPropertyAssignmentInES6.js]
 class C {
     constructor() {
         this.x = "Hello world";

tests/baselines/reference/emitClassDeclarationWithConstructorPropertyAssignmentInES6.types renamed to tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithConstructorPropertyAssignmentInES6.ts ===
+=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithPropertyAssignmentInES6.ts ===
 class C {
 >C : C
 

tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.js

@@ -0,0 +1,23 @@
+//// [emitClassDeclarationWithStaticPropertyAssignmentInES6.ts]
+class C {
+    static z: string = "Foo";
+}
+
+class D {
+    x = 20000;
+    static b = true;
+}
+
+
+//// [emitClassDeclarationWithStaticPropertyAssignmentInES6.js]
+class C {
+    constructor() {
+    }
+}
+C.z = "Foo";
+class D {
+    constructor() {
+        this.x = 20000;
+    }
+}
+D.b = true;

tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.types

@@ -0,0 +1,18 @@
+=== tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithStaticPropertyAssignmentInES6.ts ===
+class C {
+>C : C
+
+    static z: string = "Foo";
+>z : string
+}
+
+class D {
+>D : D
+
+    x = 20000;
+>x : number
+
+    static b = true;
+>b : boolean
+}
+

tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithConstructorPropertyAssignmentInES6.ts renamed to tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithPropertyAssignmentInES6.ts

@@ -0,0 +1,9 @@
+// @target:es6
+class C {
+    static z: string = "Foo";
+}
+
+class D {
+    x = 20000;
+    static b = true;
+}