Don't inline paren at right of arguments (#1345)

Fixes #1338
prettier · Apr 19, 2017 · 3dc7562 · 3dc7562
1 parent aafcf5f
commit 3dc7562
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/comments.js b/src/comments.js
@@ -244,7 +244,7 @@ function attach(comments, ast, text, options) {
         ) ||
         handleObjectPropertyAssignment(enclosingNode, precedingNode, comment) ||
         handleTemplateLiteralComments(enclosingNode, comment) ||
-        handleCommentInEmptyParens(enclosingNode, comment) ||
+        handleCommentInEmptyParens(text, enclosingNode, comment) ||
         handleOnlyComments(enclosingNode, ast, comment, isLastComment)
       ) {
         // We're good
@@ -516,7 +516,11 @@ function handleTemplateLiteralComments(enclosingNode, comment) {
   return false;
 }
 
-function handleCommentInEmptyParens(enclosingNode, comment) {
+function handleCommentInEmptyParens(text, enclosingNode, comment) {
+  if (getNextNonSpaceNonCommentCharacter(text, comment) !== ")") {
+    return false;
+  }
+
   // Only add dangling comments to fix the case when no params are present,
   // i.e. a function without any argument.
   if (

diff --git a/src/printer.js b/src/printer.js
@@ -2119,7 +2119,11 @@ function printMethod(path, options, print) {
     group(
       concat([
         path.call(function(valuePath) {
-          return printFunctionParams(valuePath, print, options);
+          return comments.printComments(
+            path,
+            p => printFunctionParams(valuePath, print, options),
+            options
+          )
         }, "value"),
         path.call(p => printReturnType(p, print), "value")
       ])

diff --git a/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap b/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap
@@ -14,12 +14,12 @@ const obj = {
 
 class Foo {
   f(/* ... */) {}
+  f() /* ... */ {}
   f = (/* ... */) => {};
   static f(/* ... */) {};
   static f = (/* ... */) => {};
   static f = function(/* ... */) {};
   static f = function f(/* ... */) {};
-  static f /* ... */() {};
 }
 
 f(/* ... */);
@@ -40,12 +40,13 @@ const obj = {
 
 class Foo {
   f(/* ... */) {}
+  f() /* ... */ {
+  }
   f = (/* ... */) => {};
   static f(/* ... */) {}
   static f = (/* ... */) => {};
   static f = function(/* ... */) {};
   static f = function f(/* ... */) {};
-  static f(/* ... */) {}
 }
 
 f(/* ... */);

diff --git a/tests/empty_paren_comment/empty_paren_comment.js b/tests/empty_paren_comment/empty_paren_comment.js
@@ -11,12 +11,12 @@ const obj = {
 
 class Foo {
   f(/* ... */) {}
+  f() /* ... */ {}
   f = (/* ... */) => {};
   static f(/* ... */) {};
   static f = (/* ... */) => {};
   static f = function(/* ... */) {};
   static f = function f(/* ... */) {};
-  static f /* ... */() {};
 }
 
 f(/* ... */);