Improve

fisker · fisker · commit fb8909072eef · 2025-09-29T17:31:14.000+08:00
diff --git a/src/language-js/comments/handle-comments.js b/src/language-js/comments/handle-comments.js
@@ -198,6 +198,17 @@ function handleIfStatementComments({
     return true;
   }
 
+  // if comment is positioned between the condition and its body
+  if (
+    followingNode.type === "BlockStatement" &&
+    followingNode === enclosingNode.consequent &&
+    locStart(comment) >= locEnd(precedingNode) &&
+    locEnd(comment) <= locStart(followingNode)
+  ) {
+    addLeadingComment(followingNode, comment);
+    return true;
+  }
+
   // Comments before `else`:
   // - treat as trailing comments of the consequent, if it's a BlockStatement
   // - treat as a dangling comment otherwise
@@ -209,6 +220,17 @@ function handleIfStatementComments({
       text,
       locEnd(enclosingNode.consequent),
     );
+
+    // if comment is positioned between the `else` token and its body
+    if (
+      followingNode.type === "BlockStatement" &&
+      locStart(comment) >= maybeElseTokenIndex &&
+      locEnd(comment) <= locStart(followingNode)
+    ) {
+      addLeadingComment(followingNode, comment);
+      return true;
+    }
+
     // With the above conditions alone, this code would also match. This is a false positive.
     // So, ignore cases where the token "else" appears immediately after the consequent:
     //
@@ -241,16 +263,6 @@ function handleIfStatementComments({
     }
   }
 
-  // if comment is positioned between the condition or else and its body
-  if (
-    followingNode.type === "BlockStatement" &&
-    locStart(comment) >= locEnd(precedingNode) &&
-    locEnd(comment) <= locStart(followingNode)
-  ) {
-    addLeadingComment(followingNode, comment);
-    return true;
-  }
-
   if (followingNode.type === "BlockStatement") {
     addBlockStatementFirstComment(followingNode, comment);
     return true;
diff --git a/tests/format/js/comments/__snapshots__/format.test.js.snap b/tests/format/js/comments/__snapshots__/format.test.js.snap
@@ -2672,8 +2672,8 @@ if (6) // comment
 } else if (7)
   // comment
   true
-// comment
-else {
+else // comment
+{
   true
 }
 
@@ -2685,9 +2685,9 @@ if (8) // comment
   // comment
   // comment
   true
+else // comment
 // comment
-// comment
-else {
+{
   true
 }
 
@@ -2701,7 +2701,8 @@ else if (12)
 else if (13)
   /* comment */ /* comment */ // comment
   true
-/* comment */ else {
+else /* comment */
+{
   true
 }
 
@@ -2818,8 +2819,8 @@ if (6) // comment
 } else if (7)
   // comment
   true;
-// comment
-else {
+else // comment
+{
   true;
 }
 
@@ -2831,9 +2832,9 @@ if (8) // comment
   // comment
   // comment
   true;
+else // comment
 // comment
-// comment
-else {
+{
   true;
 }
 
@@ -2847,7 +2848,8 @@ else if (12)
 else if (13)
   /* comment */ /* comment */ // comment
   true;
-/* comment */ else {
+else /* comment */
+{
   true;
 }
 
diff --git a/tests/format/js/if/__snapshots__/format.test.js.snap b/tests/format/js/if/__snapshots__/format.test.js.snap
@@ -94,9 +94,8 @@ if (2) // foo may not exist
   doThing(foo);
 }
 if (2) {
-}
-// foo may not exist
-else {
+} else // foo may not exist
+{
   doThing(foo);
 }
 
@@ -105,16 +104,16 @@ if (3) // foo may not exist
   doThing(foo);
 }
 if (3) {
-} // foo may not exist
-else {
+} else // foo may not exist
+{
   doThing(foo);
 }
 
 if (4) /* foo may not exist */ {
   doThing(foo);
 }
 if (4) {
-} /* foo may not exist */ else {
+} else /* foo may not exist */ {
   doThing(foo);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,8 @@ if (2) // foo may not exist`
`94`	`94`	`doThing(foo);`
`95`	`95`	`}`
`96`	`96`	`if (2) {`
`97`		`-}`
`98`		`-// foo may not exist`
`99`		`-else {`
	`97`	`+} else // foo may not exist`
	`98`	`+{`
`100`	`99`	`doThing(foo);`
`101`	`100`	`}`
`102`	`101`
`@@ -105,16 +104,16 @@ if (3) // foo may not exist`
`105`	`104`	`doThing(foo);`
`106`	`105`	`}`
`107`	`106`	`if (3) {`
`108`		`-} // foo may not exist`
`109`		`-else {`
	`107`	`+} else // foo may not exist`
	`108`	`+{`
`110`	`109`	`doThing(foo);`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`if (4) /* foo may not exist */ {`
`114`	`113`	`doThing(foo);`
`115`	`114`	`}`
`116`	`115`	`if (4) {`
`117`		`-} /* foo may not exist */ else {`
	`116`	`+} else /* foo may not exist */ {`
`118`	`117`	`doThing(foo);`
`119`	`118`	`}`
`120`	`119`