Comments: attach method name comments with estree parsers, fixes #2141 (#2170)

src/comments.js

@@ -279,6 +279,7 @@ function attach(comments, ast, text) {
         ) ||
         handleObjectPropertyAssignment(enclosingNode, precedingNode, comment) ||
         handleCommentInEmptyParens(text, enclosingNode, comment) ||
+        handleMethodNameComments(enclosingNode, precedingNode, comment) ||
         handleOnlyComments(enclosingNode, ast, comment, isLastComment)
       ) {
         // We're good
@@ -548,6 +549,24 @@ function handleObjectPropertyAssignment(enclosingNode, precedingNode, comment) {
   return false;
 }
 
+function handleMethodNameComments(enclosingNode, precedingNode, comment) {
+  // This is only needed for estree parsers (flow, typescript) to attach
+  // after a method name:
+  // obj = { fn /*comment*/() {} };
+  if (
+    enclosingNode &&
+    precedingNode &&
+    (enclosingNode.type === "Property" ||
+      enclosingNode.type === "MethodDefinition") &&
+    precedingNode.type === "Identifier" &&
+    enclosingNode.key === precedingNode
+  ) {
+    addTrailingComment(precedingNode, comment);
+    return true;
+  }
+  return false;
+}
+
 function handleCommentInEmptyParens(text, enclosingNode, comment) {
   if (getNextNonSpaceNonCommentCharacter(text, comment) !== ")") {
     return false;

tests/classes/__snapshots__/jsfmt.spec.js.snap

@@ -138,6 +138,29 @@ exports[`member.js 1`] = `
 
 `;
 
+exports[`method.js 1`] = `
+
+class C {
+  name/*comment*/() {
+  }
+};
+
+
+({
+  name/*comment*/() {
+  }
+});
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class C {
+  name /*comment*/() {}
+}
+
+({
+  name /*comment*/() {}
+});
+
+`;
+
 exports[`ternary.js 1`] = `
 if (1) (class {}) ? 1 : 2;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

tests/classes/jsfmt.spec.js

@@ -1 +1 @@
-run_spec(__dirname, null, ["typescript"]);
+run_spec(__dirname, null, ["babylon", "typescript"]);

tests/classes/method.js

@@ -0,0 +1,11 @@
+
+class C {
+  name/*comment*/() {
+  }
+};
+
+
+({
+  name/*comment*/() {
+  }
+});