fix(assist/organizeImports): don't duplicate header file comment (#6511)

Conaclos · web-flow · commit 72623fa30470 · 2025-06-23T21:44:56.000+02:00
diff --git a/.changeset/four-phones-shout.md b/.changeset/four-phones-shout.md
@@ -0,0 +1,7 @@
+---
+"@biomejs/biome": patch
+---
+
+Fixed [#6492](https://github.com/biomejs/biome/issues/6492). The
+`organizeImports` assist action no longer duplicates a comment at the start of
+the file when `:BLANK_LINE:` precedes the first import group.
diff --git a/crates/biome_js_analyze/src/assist/source/organize_imports.rs b/crates/biome_js_analyze/src/assist/source/organize_imports.rs
@@ -945,9 +945,11 @@ impl Rule for OrganizeImports {
                         };
                         let mut new_item = new_item.into_syntax();
                         let old_item = old_item.into_node()?;
-                        let blank_line_separated_groups = options
-                            .groups
-                            .separated_by_blank_line(prev_group, key.group);
+                        let blank_line_separated_groups = index != 0
+                            && options
+                                .groups
+                                .separated_by_blank_line(prev_group, key.group);
+                        prev_group = key.group;
                         // Don't make any change if it is the same node and no change have to be done
                         if !blank_line_separated_groups && index == key.slot_index && !was_merged {
                             continue;
@@ -1001,7 +1003,6 @@ impl Rule for OrganizeImports {
                             new_item = new_item.prepend_trivia_pieces(newline)?;
                         }
                         mutation.replace_element_discard_trivia(old_item.into(), new_item.into());
-                        prev_group = key.group;
                     }
                 }
             }
diff --git a/crates/biome_js_analyze/tests/specs/source/organizeImports/issue6492.js b/crates/biome_js_analyze/tests/specs/source/organizeImports/issue6492.js
@@ -0,0 +1,5 @@
+// some comment
+import react from "@vitejs/plugin-react";
+import svgr from "vite-plugin-svgr";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
diff --git a/crates/biome_js_analyze/tests/specs/source/organizeImports/issue6492.js.snap b/crates/biome_js_analyze/tests/specs/source/organizeImports/issue6492.js.snap
@@ -0,0 +1,39 @@
+---
+source: crates/biome_js_analyze/tests/spec_tests.rs
+expression: issue6492.js
+---
+# Input
+```js
+// some comment
+import react from "@vitejs/plugin-react";
+import svgr from "vite-plugin-svgr";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+```
+
+# Diagnostics
+```
+issue6492.js:2:1 assist/source/organizeImports  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  i The imports and exports are not sorted.
+  
+    1 │ // some comment
+  > 2 │ import react from "@vitejs/plugin-react";
+      │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    3 │ import svgr from "vite-plugin-svgr";
+    4 │ import { defineConfig } from "vite";
+  
+  i Safe fix: Organize Imports (Biome)
+  
+    1 1 │   // some comment
+    2 2 │   import react from "@vitejs/plugin-react";
+    3   │ - import·svgr·from·"vite-plugin-svgr";
+    4   │ - import·{·defineConfig·}·from·"vite";
+      3 │ + import·{·defineConfig·}·from·"vite";
+      4 │ + import·svgr·from·"vite-plugin-svgr";
+    5 5 │   import tsconfigPaths from "vite-tsconfig-paths";
+    6 6 │   
+  
+
+```
diff --git a/crates/biome_js_analyze/tests/specs/source/organizeImports/issue6492.options.json b/crates/biome_js_analyze/tests/specs/source/organizeImports/issue6492.options.json
@@ -0,0 +1,19 @@
+{
+	"$schema": "https://biomejs.dev/schemas/2.0.4/schema.json",
+	"assist": {
+		"enabled": true,
+		"actions": {
+			"source": {
+				"organizeImports": {
+					"level": "on",
+					"options": {
+						"groups": [
+							["react*", "react*/*"],
+							":BLANK_LINE:"
+						]
+					}
+				}
+			}
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -945,9 +945,11 @@ impl Rule for OrganizeImports {`
`945`	`945`	`};`
`946`	`946`	`let mut new_item = new_item.into_syntax();`
`947`	`947`	`let old_item = old_item.into_node()?;`
`948`		`- let blank_line_separated_groups = options`
`949`		`- .groups`
`950`		`- .separated_by_blank_line(prev_group, key.group);`
	`948`	`+ let blank_line_separated_groups = index != 0`
	`949`	`+ && options`
	`950`	`+ .groups`
	`951`	`+ .separated_by_blank_line(prev_group, key.group);`
	`952`	`+ prev_group = key.group;`
`951`	`953`	`// Don't make any change if it is the same node and no change have to be done`
`952`	`954`	`if !blank_line_separated_groups && index == key.slot_index && !was_merged {`
`953`	`955`	`continue;`
`@@ -1001,7 +1003,6 @@ impl Rule for OrganizeImports {`
`1001`	`1003`	`new_item = new_item.prepend_trivia_pieces(newline)?;`
`1002`	`1004`	`}`
`1003`	`1005`	`mutation.replace_element_discard_trivia(old_item.into(), new_item.into());`
`1004`		`- prev_group = key.group;`
`1005`	`1006`	`}`
`1006`	`1007`	`}`
`1007`	`1008`	`}`