Skip to content

refactor(lsp): move logic for Worker::did_change_configuration & ::did_change_watched_files to a combined function #16360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Dec 2, 2025
Merged

refactor(lsp): move logic for Worker::did_change_configuration & ::did_change_watched_files to a combined function #16360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 28 additions & 36 deletions crates/oxc_language_server/src/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ use tower_lsp_server::{
},
};

use crate::tool::{Tool, ToolBuilder};
use crate::{
ToolRestartChanges,
tool::{Tool, ToolBuilder},
};

/// A worker that manages the individual tools for a specific workspace
/// and reports back the results to the [`Backend`](crate::backend::Backend).
Expand Down Expand Up @@ -224,36 +227,10 @@ impl WorkspaceWorker {
options_guard.clone().unwrap_or_default()
};

let mut registrations = vec![];
let mut unregistrations = vec![];
let mut diagnostics: Option<Vec<(String, Vec<Diagnostic>)>> = None;

for tool in self.tools.write().await.iter_mut() {
let change =
tool.handle_watched_file_change(&file_event.uri, &self.root_uri, options.clone());
if let Some(reports) = change.diagnostic_reports {
if let Some(existing_diagnostics) = &mut diagnostics {
existing_diagnostics.extend(reports);
} else {
diagnostics = Some(reports);
}
}
if let Some(patterns) = change.watch_patterns {
unregistrations.push(unregistration_tool_watcher_id(tool.name(), &self.root_uri));
if !patterns.is_empty() {
registrations.push(registration_tool_watcher_id(
tool.name(),
&self.root_uri,
patterns,
));
}
}
if let Some(replaced_tool) = change.tool {
*tool = replaced_tool;
}
}

(diagnostics, registrations, unregistrations)
self.handle_tool_changes(|tool| {
tool.handle_watched_file_change(&file_event.uri, &self.root_uri, options.clone())
})
.await
}

/// Handle server configuration changes from the client
Expand Down Expand Up @@ -289,16 +266,31 @@ impl WorkspaceWorker {
*options_guard = Some(changed_options_json.clone());
}

self.handle_tool_changes(|tool| {
tool.handle_configuration_change(
&self.root_uri,
&old_options,
changed_options_json.clone(),
)
})
.await
}

/// Common implementation for handling tool changes that may result in
/// diagnostics updates, watcher registrations/unregistrations, and tool replacement
async fn handle_tool_changes<F>(
&self,
change_handler: F,
) -> (Option<Vec<(String, Vec<Diagnostic>)>>, Vec<Registration>, Vec<Unregistration>)
where
F: Fn(&mut Box<dyn Tool>) -> ToolRestartChanges,
{
let mut registrations = vec![];
let mut unregistrations = vec![];
let mut diagnostics: Option<Vec<(String, Vec<Diagnostic>)>> = None;

for tool in self.tools.write().await.iter_mut() {
let change = tool.handle_configuration_change(
&self.root_uri,
&old_options,
changed_options_json.clone(),
);
let change = change_handler(tool);
if let Some(reports) = change.diagnostic_reports {
if let Some(existing_diagnostics) = &mut diagnostics {
existing_diagnostics.extend(reports);
Expand Down
Loading