If consequent is a block statement, treat as trailing comment

maogongzi · Apr 5, 2018 · fa089f5 · fa089f5
1 parent 88489a9
commit fa089f5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
@@ -211,7 +211,11 @@ function handleIfStatementComments(
     precedingNode === enclosingNode.consequent &&
     followingNode === enclosingNode.alternate
   ) {
-    addDanglingComment(enclosingNode, comment);
+    if (precedingNode.type === "BlockStatement") {
+      addTrailingComment(precedingNode, comment);
+    } else {
+      addDanglingComment(enclosingNode, comment);
+    }
     return true;
   }
 

diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
@@ -1456,13 +1456,18 @@ function printPathNoParens(path, options, print, args) {
 
       if (n.alternate) {
         const commentOnOwnLine =
-          hasDanglingComments(n) &&
-          n.comments.some(
-            comment =>
-              !comment.leading &&
-              !comment.trailing &&
-              !privateUtil.isBlockComment(comment)
-          );
+          (hasTrailingComment(n.consequent) &&
+            n.consequent.comments.some(
+              comment =>
+                comment.trailing && !privateUtil.isBlockComment(comment)
+            )) ||
+          (hasDanglingComments(n) &&
+            n.comments.some(
+              comment =>
+                !comment.leading &&
+                !comment.trailing &&
+                !privateUtil.isBlockComment(comment)
+            ));
         const elseOnSameLine =
           n.consequent.type === "BlockStatement" && !commentOnOwnLine;
         parts.push(elseOnSameLine ? " " : hardline);

diff --git a/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap b/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap
@@ -2571,8 +2571,7 @@ type Breakfast = Apple | Orange | Broccoli | Carrot;
 function bar(x: Breakfast) {
   if (x.kind === "Fruit") {
     (x.taste: "Good");
-  }
-  // error, Apple.taste = Bad
+  } // error, Apple.taste = Bad
   else (x.raw: "No"); // error, Carrot.raw = Maybe
 }