convertFunctionToEs6Class: Copy comments from constructor to class (microsoft#22738)

Andy · web-flow · commit f2f2393f4b4a · 2018-03-22T08:12:02.000-07:00
diff --git a/src/services/codefixes/convertFunctionToEs6Class.ts b/src/services/codefixes/convertFunctionToEs6Class.ts
@@ -49,6 +49,8 @@ namespace ts.codefix {
             return undefined;
         }
 
+        copyComments(ctorDeclaration, newClassDeclaration, sourceFile);
+
         // Because the preceding node could be touched, we need to insert nodes before delete nodes.
         changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration);
         for (const deleteCallback of deletes) {
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -221,6 +221,7 @@ namespace ts.textChanges {
             return this;
         }
 
+        /** Warning: This deletes comments too. See `copyComments` in `convertFunctionToEs6Class`. */
         public deleteNode(sourceFile: SourceFile, node: Node, options: ConfigurableStartEnd = {}) {
             const startPosition = getAdjustedStartPosition(sourceFile, node, options, Position.FullStart);
             const endPosition = getAdjustedEndPosition(sourceFile, node, options);
diff --git a/tests/cases/fourslash/server/convertFunctionToEs6Class-server.ts b/tests/cases/fourslash/server/convertFunctionToEs6Class-server.ts
@@ -14,9 +14,8 @@
 verify.codeFix({
     description: "Convert function to an ES2015 class",
     newFileContent:
-// NOTE: '// Comment' should be included, but due to incorrect handling of trivia,
-// it's omitted right now.
-`class fn {\r
+`// Comment\r
+class fn {\r
     constructor() {\r
         this.baz = 10;\r
     }\r

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ namespace ts.codefix {`
`49`	`49`	`return undefined;`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ copyComments(ctorDeclaration, newClassDeclaration, sourceFile);`
	`53`	`+`
`52`	`54`	`// Because the preceding node could be touched, we need to insert nodes before delete nodes.`
`53`	`55`	`changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration);`
`54`	`56`	`for (const deleteCallback of deletes) {`
Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ namespace ts.textChanges {`
`221`	`221`	`return this;`
`222`	`222`	`}`
`223`	`223`
	`224`	+ /** Warning: This deletes comments too. See `copyComments` in `convertFunctionToEs6Class`. */
`224`	`225`	`public deleteNode(sourceFile: SourceFile, node: Node, options: ConfigurableStartEnd = {}) {`
`225`	`226`	`const startPosition = getAdjustedStartPosition(sourceFile, node, options, Position.FullStart);`
`226`	`227`	`const endPosition = getAdjustedEndPosition(sourceFile, node, options);`