Merge pull request microsoft#11397 from Microsoft/release-2.0.5_fix11384

yuit · web-flow · commit be8552431963 · 2016-10-06T13:57:25.000-07:00
[Release-2.0.5] Do not emit wrong extra comma
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1968,17 +1968,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 emitObjectLiteralBody(node, firstComputedPropertyIndex);
 
                 for (let i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
-                    writeComma();
-
                     const property = properties[i];
 
-                    emitStart(property);
                     if (property.kind === SyntaxKind.GetAccessor || property.kind === SyntaxKind.SetAccessor) {
                         // TODO (drosen): Reconcile with 'emitMemberFunctions'.
                         const accessors = getAllAccessorDeclarations(node.properties, <AccessorDeclaration>property);
                         if (property !== accessors.firstAccessor) {
                             continue;
                         }
+                        writeComma();
+                        emitStart(property);
                         write("Object.defineProperty(");
                         emit(tempVar);
                         write(", ");
@@ -2019,6 +2018,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         emitEnd(property);
                     }
                     else {
+                        writeComma();
+                        emitStart(property);
                         emitLeadingComments(property);
                         emitStart(property.name);
                         emit(tempVar);
@@ -2039,9 +2040,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         else {
                             Debug.fail("ObjectLiteralElement type not accounted for: " + property.kind);
                         }
+                        emitEnd(property);
                     }
 
-                    emitEnd(property);
                 }
 
                 writeComma();
diff --git a/tests/baselines/reference/computedPropertyNames49_ES5.js b/tests/baselines/reference/computedPropertyNames49_ES5.js
@@ -60,7 +60,6 @@ var x = (_a = {
         enumerable: true,
         configurable: true
     }),
-    ,
     _a.p2 = 20,
     _a
 );
diff --git a/tests/baselines/reference/computedPropertyNames50_ES5.js b/tests/baselines/reference/computedPropertyNames50_ES5.js
@@ -56,7 +56,6 @@ var x = (_a = {
         enumerable: true,
         configurable: true
     }),
-    ,
     _a.p2 = 20,
     _a
 );
