Skip to content

fix(lsp): skip (un)registering file watcher when not dynamic watchers are supported #16406

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

fix(lsp): skip (un)registering file watcher when not dynamic watchers are supported #16406

Show file tree
Hide file tree
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
25 changes: 14 additions & 11 deletions crates/oxc_language_server/src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ impl LanguageServer for Backend {
if !clearing_diagnostics.is_empty() {
self.clear_diagnostics(clearing_diagnostics).await;
}

if !removed_registrations.is_empty()
if self.capabilities.get().unwrap().dynamic_watchers
&& !removed_registrations.is_empty()
&& let Err(err) = self.client.unregister_capability(removed_registrations).await
{
warn!("sending unregisterCapability.didChangeWatchedFiles failed: {err}");
Expand Down Expand Up @@ -402,16 +402,19 @@ impl LanguageServer for Backend {
if !new_diagnostics.is_empty() {
self.publish_all_diagnostics(&new_diagnostics).await;
}
if !removing_registrations.is_empty()
&& let Err(err) = self.client.unregister_capability(removing_registrations).await
{
warn!("sending unregisterCapability.didChangeWatchedFiles failed: {err}");
}

if !adding_registrations.is_empty()
&& let Err(err) = self.client.register_capability(adding_registrations).await
{
warn!("sending registerCapability.didChangeWatchedFiles failed: {err}");
if self.capabilities.get().is_some_and(|capabilities| capabilities.dynamic_watchers) {
if !removing_registrations.is_empty()
&& let Err(err) = self.client.unregister_capability(removing_registrations).await
{
warn!("sending unregisterCapability.didChangeWatchedFiles failed: {err}");
}

if !adding_registrations.is_empty()
&& let Err(err) = self.client.register_capability(adding_registrations).await
{
warn!("sending registerCapability.didChangeWatchedFiles failed: {err}");
}
}
}

Expand Down
16 changes: 8 additions & 8 deletions crates/oxc_language_server/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ mod test_suite {
assert_eq!(execute_command_response.result().unwrap(), &json!(null));

// shutdown request
server.shutdown_with_watchers(4).await;
server.shutdown(4).await;
}

#[tokio::test]
Expand All @@ -662,7 +662,7 @@ mod test_suite {
assert_eq!(execute_command_response.result().unwrap(), &json!(null));

// shutdown request
server.shutdown_with_watchers(4).await;
server.shutdown(4).await;
}

#[tokio::test]
Expand All @@ -683,7 +683,7 @@ mod test_suite {
assert_eq!(execute_command_response.id(), &Id::Number(3));
assert_eq!(execute_command_response.result().unwrap(), &json!(null));

server.shutdown_with_watchers(4).await;
server.shutdown(4).await;
}

#[tokio::test]
Expand All @@ -705,7 +705,7 @@ mod test_suite {
server.send_request(folders_changed_notification).await;

// No direct response expected for notifications, client does not support workspace configuration or watchers
server.shutdown_with_watchers(3).await;
server.shutdown(3).await;
}

#[tokio::test]
Expand Down Expand Up @@ -756,7 +756,7 @@ mod test_suite {
// workspace configuration request expected, one for new folder
response_to_configuration(&mut server, vec![json!(null)]).await;

server.shutdown_with_watchers(4).await;
server.shutdown(4).await;
}

#[tokio::test]
Expand Down Expand Up @@ -930,7 +930,7 @@ mod test_suite {
server.send_request(did_open(&file, "some text")).await;
server.send_request(did_change(&file, "changed text")).await;
server.send_request(did_close(&file)).await;
server.shutdown_with_watchers(3).await;
server.shutdown(3).await;
}

#[tokio::test]
Expand All @@ -952,7 +952,7 @@ mod test_suite {
assert!(response.id() == &Id::Number(3));
assert!(response.result().is_some_and(|result| *result == Value::Null));

server.shutdown_with_watchers(4).await;
server.shutdown(4).await;
}

#[tokio::test]
Expand All @@ -977,6 +977,6 @@ mod test_suite {
assert_eq!(actions.len(), 1);
assert_eq!(actions[0]["title"], "Code Action title");

server.shutdown_with_watchers(4).await;
server.shutdown(4).await;
}
}
Loading