From d815c14943241c5d7fdc03d783534535fd1e158f Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 14 Aug 2014 05:57:24 -0700
Subject: [PATCH] Emit the property assignment comments of the object literal

---
 src/compiler/emitter.ts                                      | 2 ++
 tests/baselines/reference/commentsInterface.js               | 1 +
 tests/baselines/reference/commentsOnObjectLiteral2.js        | 5 +++++
 tests/baselines/reference/commentsPropertySignature1.js      | 1 +
 .../propertyAccessOnTypeParameterWithConstraints5.js         | 1 +
 5 files changed, 10 insertions(+)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index a6a4dbad765..643dc978469 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -716,9 +716,11 @@ module ts {
             }
 
             function emitPropertyAssignment(node: PropertyDeclaration) {
+                emitLeadingComments(node);
                 emit(node.name);
                 write(": ");
                 emit(node.initializer);
+                emitTrailingComments(node);
             }
 
             function emitPropertyAccess(node: PropertyAccess) {
diff --git a/tests/baselines/reference/commentsInterface.js b/tests/baselines/reference/commentsInterface.js
index 38853dc460c..f973422e56f 100644
--- a/tests/baselines/reference/commentsInterface.js
+++ b/tests/baselines/reference/commentsInterface.js
@@ -91,6 +91,7 @@ var i3_i;
 i3_i = {
     f: function (a) { return "Hello" + a; },
     l: this.f,
+    /** own x*/
     x: this.f(10),
     nc_x: this.l(this.x),
     nc_f: this.f,
diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.js b/tests/baselines/reference/commentsOnObjectLiteral2.js
index cc64db96c01..028a17652fa 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral2.js
+++ b/tests/baselines/reference/commentsOnObjectLiteral2.js
@@ -14,6 +14,11 @@ var Person = makeClass(
 
 //// [commentsOnObjectLiteral2.js]
 var Person = makeClass({
+    /** 
+        This is just another way to define a constructor. 
+        @constructs 
+        @param {string} name The name of the person. 
+        */
     initialize: function (name) {
         this.name = name;
     }
diff --git a/tests/baselines/reference/commentsPropertySignature1.js b/tests/baselines/reference/commentsPropertySignature1.js
index f216ac9ba94..db3186d8624 100644
--- a/tests/baselines/reference/commentsPropertySignature1.js
+++ b/tests/baselines/reference/commentsPropertySignature1.js
@@ -7,5 +7,6 @@ var a = {
 
 //// [commentsPropertySignature1.js]
 var a = {
+    /** own x*/
     x: 0
 };
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
index cfe1404487a..776d8d803b7 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -92,6 +92,7 @@ var b = {
         var a = x['foo']();
         return a + x.notHere();
     },
+    // BUG 794164
     bar: b.foo(1).notHere()
 };
 var r4 = b.foo(new B());