refactor(language_server): improve file watching for different tools

Author: Sysix

crates/oxc_language_server/src/backend.rs

@@ -3,18 +3,17 @@ use std::{str::FromStr, sync::Arc};
 use futures::future::join_all;
 use log::{debug, info, warn};
 use rustc_hash::FxBuildHasher;
-use serde_json::json;
 use tokio::sync::{OnceCell, RwLock, SetError};
 use tower_lsp_server::{
     Client, LanguageServer,
     jsonrpc::{Error, ErrorCode, Result},
     lsp_types::{
         CodeActionParams, CodeActionResponse, ConfigurationItem, Diagnostic,
         DidChangeConfigurationParams, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
-        DidChangeWatchedFilesRegistrationOptions, DidChangeWorkspaceFoldersParams,
-        DidCloseTextDocumentParams, DidOpenTextDocumentParams, DidSaveTextDocumentParams,
-        DocumentFormattingParams, ExecuteCommandParams, InitializeParams, InitializeResult,
-        InitializedParams, Registration, ServerInfo, TextEdit, Unregistration, Uri, WorkspaceEdit,
+        DidChangeWorkspaceFoldersParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams,
+        DidSaveTextDocumentParams, DocumentFormattingParams, ExecuteCommandParams,
+        InitializeParams, InitializeResult, InitializedParams, Registration, ServerInfo, TextEdit,
+        Unregistration, Uri, WorkspaceEdit,
     },
 };
 
@@ -204,13 +203,7 @@ impl LanguageServer for Backend {
         // init all file watchers
         if capabilities.dynamic_watchers {
             for worker in workers {
-                registrations.push(Registration {
-                    id: format!("watcher-{}", worker.get_root_uri().as_str()),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                    register_options: Some(json!(DidChangeWatchedFilesRegistrationOptions {
-                        watchers: worker.init_watchers().await
-                    })),
-                });
+                registrations.extend(worker.init_watchers().await);
             }
         }
 
@@ -326,7 +319,7 @@ impl LanguageServer for Backend {
                 continue;
             };
 
-            let (diagnostics, watchers, formatter_activated) =
+            let (diagnostics, registrations, unregistrations, formatter_activated) =
                 worker.did_change_configuration(&option.options).await;
 
             if formatter_activated && self.capabilities.get().is_some_and(|c| c.dynamic_formatting)
@@ -338,23 +331,8 @@ impl LanguageServer for Backend {
                 new_diagnostics.extend(diagnostics);
             }
 
-            if let Some(watchers) = watchers
-                && self.capabilities.get().is_some_and(|capabilities| capabilities.dynamic_watchers)
-            {
-                // remove the old watcher
-                removing_registrations.push(Unregistration {
-                    id: format!("watcher-{}", worker.get_root_uri().as_str()),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                });
-                // add the new watcher
-                adding_registrations.push(Registration {
-                    id: format!("watcher-{}", worker.get_root_uri().as_str()),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                    register_options: Some(json!(DidChangeWatchedFilesRegistrationOptions {
-                        watchers
-                    })),
-                });
-            }
+            removing_registrations.extend(unregistrations);
+            adding_registrations.extend(registrations);
         }
 
         if !new_diagnostics.is_empty() {
@@ -464,13 +442,7 @@ impl LanguageServer for Backend {
 
                 worker.start_worker(options).await;
 
-                added_registrations.push(Registration {
-                    id: format!("watcher-{}", worker.get_root_uri().as_str()),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                    register_options: Some(json!(DidChangeWatchedFilesRegistrationOptions {
-                        watchers: worker.init_watchers().await
-                    })),
-                });
+                added_registrations.extend(worker.init_watchers().await);
                 workers.push(worker);
             }
         // client does not support the request

crates/oxc_language_server/src/formatter/server_formatter.rs

@@ -9,7 +9,7 @@ use oxc_formatter::{
 use oxc_parser::{ParseOptions, Parser};
 use tower_lsp_server::{
     UriExt,
-    lsp_types::{Position, Range, TextEdit, Uri},
+    lsp_types::{Pattern, Position, Range, TextEdit, Uri},
 };
 
 use crate::formatter::options::FormatOptions as LSPFormatOptions;
@@ -103,6 +103,23 @@ impl ServerFormatter {
             }
         }
     }
+
+    #[expect(clippy::unused_self)]
+    pub fn get_watcher_patterns(&self, options: &LSPFormatOptions) -> Pattern {
+        options.config_path.as_ref().map_or(FORMAT_CONFIG_FILE, |v| v).to_owned()
+    }
+
+    pub fn get_changed_watch_patterns(
+        &self,
+        old_options: &LSPFormatOptions,
+        new_options: &LSPFormatOptions,
+    ) -> Option<Pattern> {
+        if old_options != new_options && new_options.experimental {
+            return Some(self.get_watcher_patterns(new_options));
+        }
+
+        None
+    }
 }
 
 /// Returns the minimal text edit (start, end, replacement) to transform `source_text` into `formatted_text`

crates/oxc_language_server/src/linter/server_linter.rs

@@ -7,7 +7,7 @@ use log::{debug, warn};
 use oxc_linter::{AllowWarnDeny, LintIgnoreMatcher};
 use rustc_hash::{FxBuildHasher, FxHashMap, FxHashSet};
 use tokio::sync::Mutex;
-use tower_lsp_server::lsp_types::{Diagnostic, Uri};
+use tower_lsp_server::lsp_types::{Diagnostic, Pattern, Uri};
 
 use oxc_linter::{
     Config, ConfigStore, ConfigStoreBuilder, ExternalPluginStore, LintOptions, Oxlintrc,
@@ -40,7 +40,7 @@ pub struct ServerLinter {
     gitignore_glob: Vec<Gitignore>,
     lint_on_run: Run,
     diagnostics: ServerLinterDiagnostics,
-    pub extended_paths: FxHashSet<PathBuf>,
+    extended_paths: FxHashSet<PathBuf>,
 }
 
 #[derive(Debug, Default)]
@@ -378,6 +378,39 @@ impl ServerLinter {
             // TODO: only the TsgoLinter needs to be dropped or created
             || old_options.type_aware != new_options.type_aware
     }
+
+    pub fn get_watch_patterns(&self, options: &LSPLintOptions, root_path: &Path) -> Vec<Pattern> {
+        let mut watchers = vec![
+            options.config_path.as_ref().unwrap_or(&"**/.oxlintrc.json".to_string()).to_owned(),
+        ];
+
+        for path in &self.extended_paths {
+            // ignore .oxlintrc.json files when using nested configs
+            if path.ends_with(".oxlintrc.json") && options.use_nested_configs() {
+                continue;
+            }
+
+            let pattern = path.strip_prefix(root_path).unwrap_or(path);
+
+            watchers.push(normalize_path(pattern).to_string_lossy().to_string());
+        }
+        watchers
+    }
+
+    pub fn get_changed_watch_patterns(
+        &self,
+        old_options: &LSPLintOptions,
+        new_options: &LSPLintOptions,
+        root_path: &Path,
+    ) -> Option<Vec<Pattern>> {
+        if old_options.config_path == new_options.config_path
+            && old_options.use_nested_configs() == new_options.use_nested_configs()
+        {
+            return None;
+        }
+
+        Some(self.get_watch_patterns(new_options, root_path))
+    }
 }
 
 #[cfg(test)]