fix(js_formatter): fix wrong Indentation for leading comments in empt…

…y statement (#858)
biomejs · Nov 23, 2023 · a69a094 · a69a094
1 parent c61b4b6
commit a69a094
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/crates/biome_js_formatter/src/js/statements/empty_statement.rs b/crates/biome_js_formatter/src/js/statements/empty_statement.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use biome_formatter::write;
+use biome_formatter::{write, CstFormatContext};
 
 use biome_js_syntax::{JsEmptyStatement, JsEmptyStatementFields, JsSyntaxKind};
 use biome_rowan::{AstNode, SyntaxNodeOptionExt};
@@ -12,6 +12,18 @@ impl FormatNodeRule<JsEmptyStatement> for FormatJsEmptyStatement {
         let JsEmptyStatementFields { semicolon_token } = node.as_fields();
         let parent_kind = node.syntax().parent().kind();
 
+        let leading_comments_with_break = f
+            .context()
+            .comments()
+            .leading_comments(node.syntax())
+            .iter()
+            .any(|comment| comment.lines_before() > 0 || comment.kind().is_line());
+
+        if leading_comments_with_break {
+            write!(f, [hard_line_break()])?;
+        }
+        write!(f, [format_leading_comments(node.syntax())])?;
+
         if matches!(
             parent_kind,
             Some(
@@ -30,4 +42,9 @@ impl FormatNodeRule<JsEmptyStatement> for FormatJsEmptyStatement {
             write!(f, [format_removed(&semicolon_token?)])
         }
     }
+
+    fn fmt_leading_comments(&self, _: &JsEmptyStatement, _: &mut JsFormatter) -> FormatResult<()> {
+        // Formatted inside of `fmt_fields`
+        Ok(())
+    }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/comments.js b/crates/biome_js_formatter/tests/specs/js/module/comments.js
@@ -76,3 +76,11 @@ statement /* comment */;
 "test" /*trailing*/ ;
 
 /* EOF comment */
+
+function foo() {
+    if (bar) {
+        foo
+    }
+    // empty statement leading comments
+    ;
+}
diff --git a/crates/biome_js_formatter/tests/specs/js/module/comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/comments.js.snap
@@ -85,6 +85,14 @@ statement /* comment */;
 
 /* EOF comment */
 
+function foo() {
+    if (bar) {
+        foo
+    }
+    // empty statement leading comments
+    ;
+}
+
 ```
 
 
@@ -195,6 +203,13 @@ statement /* comment */;
 ("test") /*trailing*/;
 
 /* EOF comment */
+
+function foo() {
+	if (bar) {
+		foo;
+	}
+	// empty statement leading comments
+}
 ```