From b52747e12c7444512eb73a03737e83d8a92bc9ba Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Mon, 26 Jun 2017 10:54:18 -0700
Subject: [PATCH] Add property comments as well

---
 src/services/refactors/convertFunctionToEs6Class.ts     | 4 +++-
 tests/cases/fourslash/convertFunctionToEs6ClassJsDoc.ts | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/services/refactors/convertFunctionToEs6Class.ts b/src/services/refactors/convertFunctionToEs6Class.ts
index 925f0856a3f..745ba6d15bf 100644
--- a/src/services/refactors/convertFunctionToEs6Class.ts
+++ b/src/services/refactors/convertFunctionToEs6Class.ts
@@ -197,8 +197,10 @@ namespace ts.refactor {
                         if (isSourceFileJavaScript(sourceFile)) {
                             return;
                         }
-                        return createProperty(/*decorators*/ undefined, modifiers, memberDeclaration.name, /*questionToken*/ undefined,
+                        const prop = createProperty(/*decorators*/ undefined, modifiers, memberDeclaration.name, /*questionToken*/ undefined,
                             /*type*/ undefined, assignmentBinaryExpression.right);
+                        copyComments(assignmentBinaryExpression.parent, prop);
+                        return prop;
                     }
                 }
             }
diff --git a/tests/cases/fourslash/convertFunctionToEs6ClassJsDoc.ts b/tests/cases/fourslash/convertFunctionToEs6ClassJsDoc.ts
index afa4c6acf3e..87ee2a738c2 100644
--- a/tests/cases/fourslash/convertFunctionToEs6ClassJsDoc.ts
+++ b/tests/cases/fourslash/convertFunctionToEs6ClassJsDoc.ts
@@ -3,6 +3,7 @@
 // @allowNonTsExtensions: true
 // @Filename: test123.js
 //// function fn() {
+////     /** neat! */
 ////     this.x = 100;
 //// }
 //// 
@@ -16,6 +17,7 @@
 verify.fileAfterApplyingRefactorAtMarker('1',
 `class fn {
     constructor() {
+        /** neat! */
         this.x = 100;
     }
     /**