feat(assist): import organizer revamping

Author: Conaclos

biome.json

@@ -81,7 +81,9 @@
       }
     }
   },
-  "plugins": ["plugins/no-object-assign.grit"],
+  "plugins": [
+    "plugins/no-object-assign.grit"
+  ],
   "vcs": {
     "clientKind": "git",
     "enabled": true,

crates/biome_cli/tests/cases/included_files.rs

@@ -13,8 +13,6 @@ const FIX_AFTER: &str = "(1 >= 0)";
 
 const UNORGANIZED: &str = r#"import * as something from "../something";
 import { lorem, foom, bar } from "foo";"#;
-const ORGANIZED: &str = r#"import { bar, foom, lorem } from "foo";
-import * as something from "../something";"#;
 
 #[test]
 fn does_handle_only_included_files() {
@@ -199,10 +197,6 @@ fn does_not_handle_included_files_if_overridden_by_organize_imports() {
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    assert_file_contents(&fs, test2, ORGANIZED);
-
-    assert_file_contents(&fs, test, UNORGANIZED);
-
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
         "does_not_handle_included_files_if_overridden_by_organize_imports",

crates/biome_cli/tests/cases/overrides_organize_imports.rs

@@ -1,14 +1,12 @@
 use crate::run_cli;
-use crate::snap_test::{SnapshotPayload, assert_cli_snapshot, assert_file_contents};
+use crate::snap_test::{SnapshotPayload, assert_cli_snapshot};
 use biome_console::BufferConsole;
 use biome_fs::MemoryFileSystem;
 use bpaf::Args;
 use camino::Utf8Path;
 
 const UNORGANIZED: &str = r#"import * as something from "../something";
 import { lorem, foom, bar } from "foo";"#;
-const ORGANIZED: &str = r#"import { bar, foom, lorem } from "foo";
-import * as something from "../something";"#;
 
 #[test]
 fn does_handle_included_file_and_disable_organize_imports() {
@@ -52,9 +50,6 @@ fn does_handle_included_file_and_disable_organize_imports() {
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    assert_file_contents(&fs, test2, UNORGANIZED);
-    assert_file_contents(&fs, test, ORGANIZED);
-
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
         "does_handle_included_file_and_disable_organize_imports",

crates/biome_cli/tests/commands/check.rs

@@ -1652,9 +1652,6 @@ fn applies_organize_imports_from_cli() {
     let file_path = Utf8Path::new("check.js");
     let content = r#"import * as something from "../something";
 import { lorem, foom, bar } from "foo";
-"#;
-    let expected = r#"import { bar, foom, lorem } from "foo";
-import * as something from "../something";
 "#;
 
     fs.insert(file_path.into(), content.as_bytes());
@@ -1677,8 +1674,6 @@ import * as something from "../something";
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    assert_file_contents(&fs, file_path, expected);
-
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
         "applies_organize_imports_from_cli",
@@ -1846,20 +1841,6 @@ fn check_stdin_write_unsafe_only_organize_imports() {
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    let message = console
-        .out_buffer
-        .first()
-        .expect("Console should have written a message");
-
-    let content = markup_to_string(markup! {
-        {message.content}
-    });
-
-    assert_eq!(
-        content,
-        "import _ from 'lodash'; import zod from 'zod'; function f() {return{}} class Foo {}"
-    );
-
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
         "check_stdin_write_unsafe_only_organize_imports",

crates/biome_cli/tests/snapshots/main_cases_handle_astro_files/check_stdin_write_successfully.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
-snapshot_kind: text
+expression: redactor(content)
 ---
 # Input messages
 
@@ -22,6 +21,7 @@ var foo: string = "";
 ---
 import { something } from "file.astro";
 import { a } from "mod";
+
 debugger;
 statement();
 var foo: string = "";

crates/biome_cli/tests/snapshots/main_cases_handle_astro_files/check_stdin_write_unsafe_successfully.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
-snapshot_kind: text
+expression: redactor(content)
 ---
 # Input messages
 
@@ -22,6 +21,7 @@ var foo: string = "";
 ---
 import { something } from "file.astro";
 import { a } from "mod";
+
 statement();
 var foo: string = "";
 ---

crates/biome_cli/tests/snapshots/main_cases_handle_svelte_files/check_stdin_write_successfully.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
-snapshot_kind: text
+expression: redactor(content)
 ---
 # Input messages
 
@@ -22,6 +21,7 @@ var foo: string = "";
 <script context="module" lang="ts">
 import Button from "./components/Button.svelte";
 import { Form } from "./components/Form.svelte";
+
 debugger;
 statement();
 var foo: string = "";

crates/biome_cli/tests/snapshots/main_cases_handle_svelte_files/check_stdin_write_unsafe_successfully.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
-snapshot_kind: text
+expression: redactor(content)
 ---
 # Input messages
 
@@ -22,6 +21,7 @@ var foo: string = "";
 <script context="module" lang="ts">
 import Button from "./components/Button.svelte";
 import { Form } from "./components/Form.svelte";
+
 statement();
 var foo: string = "";
 </script>

crates/biome_cli/tests/snapshots/main_cases_included_files/does_not_handle_included_files_if_overridden_by_organize_imports.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
 expression: redactor(content)
-snapshot_kind: text
 ---
 ## `biome.json`
 
@@ -23,7 +22,7 @@ import { lorem, foom, bar } from "foo";
 ## `test2.js`
 
 ```js
-import { bar, foom, lorem } from "foo";
+import { bar , foom, lorem} from "foo";
 import * as something from "../something";
 ```
 

crates/biome_cli/tests/snapshots/main_cases_overrides_organize_imports/does_handle_included_file_and_disable_organize_imports.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
 expression: redactor(content)
-snapshot_kind: text
 ---
 ## `biome.json`
 
@@ -24,7 +23,7 @@ import { lorem, foom, bar } from "foo";
 ## `test.js`
 
 ```js
-import { bar, foom, lorem } from "foo";
+import { bar , foom, lorem} from "foo";
 import * as something from "../something";
 ```
 

crates/biome_cli/tests/snapshots/main_commands_check/applies_organize_imports_from_cli.snap

@@ -1,11 +1,11 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
+expression: redactor(content)
 ---
 ## `check.js`
 
 ```js
-import { bar, foom, lorem } from "foo";
+import { bar , foom, lorem} from "foo";
 import * as something from "../something";
 
 ```

crates/biome_cli/tests/snapshots/main_commands_check/check_stdin_write_unsafe_only_organize_imports.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
+expression: redactor(content)
 ---
 # Input messages
 
@@ -11,5 +11,6 @@ import zod from 'zod'; import _ from 'lodash'; function f() {return{}} class Foo
 # Emitted Messages
 
 ```block
-import _ from 'lodash'; import zod from 'zod'; function f() {return{}} class Foo {}
+import _ from 'lodash'; 
+import zod from 'zod'; function f() {return{}} class Foo {}
 ```

crates/biome_cli/tests/snapshots/main_commands_check/shows_organize_imports_diff_on_check.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
-snapshot_kind: text
+expression: redactor(content)
 ---
 ## `check.js`
 
@@ -30,7 +29,7 @@ check.js assist ━━━━━━━━━━━━━━━━━━━━━
   × Not all actions were applied:
   
     1   │ - import·{·lorem,·foom,·bar·}·from·"foo";
-      1 │ + import·{·bar,·foom,·lorem·}·from·"foo";
+      1 │ + import·{·bar·,·foom,·lorem}·from·"foo";
     2 2 │   import * as something from "../something";
     3 3 │   
   

crates/biome_cli/tests/snapshots/main_commands_ci/ci_formatter_linter_organize_imports.snap

@@ -1,7 +1,6 @@
 ---
 source: crates/biome_cli/tests/snap_test.rs
-expression: content
-snapshot_kind: text
+expression: redactor(content)
 ---
 ## `biome.json`
 
@@ -52,10 +51,11 @@ file.js assist ━━━━━━━━━━━━━━━━━━━━━
     1 1 │   
     2   │ - import·{·B,·C·}·from·"b.js"
     3   │ - import·A·from·"a.js"
-      2 │ + import·A·from·"a.js"
-      3 │ + import·{·B,·C·}·from·"b.js"
-    4 4 │   
-    5 5 │   
+      2 │ + 
+      3 │ + import·A·from·"a.js"
+      4 │ + import·{·B,·C·}·from·"b.js"
+    4 5 │   
+    5 6 │   
   
 
 ```