crates/biome_service/src/scanner/watcher.rs (1)

193-200: Don’t hinge on the first path; partition by existence

Rare, but if a platform emits multiple paths for a Modify, basing the action on paths[0] could mishandle some entries. Partition and handle both buckets.

Try:

-                ModifyKind::Data(_) | ModifyKind::Name(RenameMode::Any) | ModifyKind::Any => {
-                    // It's possible to receive Modify(Data) event after the file is removed on macOS.
-                    let path = &paths[0];
-                    if workspace.fs().path_is_file(path) || workspace.fs().path_is_dir(path) {
-                        Self::index_paths(workspace, paths)
-                    } else {
-                        Self::unload_paths(workspace, paths)
-                    }
-                }
+                ModifyKind::Data(_) | ModifyKind::Name(RenameMode::Any) | ModifyKind::Any => {
+                    // On macOS, Modify(Data) can follow a removal; decide per path.
+                    let (existing, missing): (Vec<_>, Vec<_>) = paths
+                        .into_iter()
+                        .partition(|p| workspace.fs().path_is_file(p) || workspace.fs().path_is_dir(p));
+                    let mut diagnostics = Vec::new();
+                    if !existing.is_empty() {
+                        diagnostics.extend(Self::index_paths(workspace, existing)?);
+                    }
+                    if !missing.is_empty() {
+                        diagnostics.extend(Self::unload_paths(workspace, missing)?);
+                    }
+                    Ok(diagnostics)
+                }

crates/biome_service/src/scanner/watcher.tests.rs (1)

59-62: LGTM; macOS settle time is a pragmatic fix

The guarded 1s sleeps make the tests sane on FSEvents. Consider a tiny helper to de‑dupe and centralise the delay.

Apply this change and call it from both spots:

+#[cfg(target_os = "macos")]
+fn wait_for_fsevents_ready() {
+    sleep(Duration::from_secs(1));
+}
+
@@
-        #[cfg(target_os = "macos")]
-        sleep(Duration::from_secs(1));
+        #[cfg(target_os = "macos")]
+        wait_for_fsevents_ready();
@@
-        #[cfg(target_os = "macos")]
-        sleep(Duration::from_secs(1));
+        #[cfg(target_os = "macos")]
+        wait_for_fsevents_ready();

Also applies to: 129-131

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Learnt from: CR
PR: biomejs/biome#0
File: crates/biome_service/CONTRIBUTING.md:0-0
Timestamp: 2025-08-11T11:53:15.299Z
Learning: Applies to crates/biome_service/src/workspace/watcher.tests.rs : Place watcher tests for workspace methods in src/workspace/watcher.tests.rs

Learnt from: CR
PR: biomejs/biome#0
File: crates/biome_service/CONTRIBUTING.md:0-0
Timestamp: 2025-08-11T11:53:15.299Z
Learning: Applies to crates/biome_service/src/workspace_watcher.rs : Keep workspace state in sync with the filesystem using WorkspaceWatcher; only active in daemon mode

Learnt from: CR
PR: biomejs/biome#0
File: crates/biome_service/CONTRIBUTING.md:0-0
Timestamp: 2025-08-11T11:53:15.299Z
Learning: Applies to crates/biome_service/src/workspace/watcher.tests.rs : Place watcher tests for workspace methods in src/workspace/watcher.tests.rs