Skip to content

refactor(language_server): pass LintOptions to Worker::refresh_server_linter #14510

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
merged 1 commit into from
Oct 12, 2025
Merged

refactor(language_server): pass LintOptions to Worker::refresh_server_linter #14510

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
18 changes: 12 additions & 6 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 @@ -16,6 +16,7 @@ use crate::{
formatter::server_formatter::ServerFormatter,
linter::{
error_with_position::DiagnosticReport,
options::LintOptions,
server_linter::{ServerLinter, ServerLinterRun},
},
options::Options,
Expand Down Expand Up @@ -155,10 +156,7 @@ impl WorkspaceWorker {
/// Refresh the server linter with the current options
/// This will recreate the linter and re-read the config files.
/// Call this when the options have changed and the linter needs to be updated.
async fn refresh_server_linter(&self) {
let options = self.options.lock().await;
let default_options = Options::default();
let lint_options = &options.as_ref().unwrap_or(&default_options).lint;
async fn refresh_server_linter(&self, lint_options: &LintOptions) {
let server_linter = ServerLinter::new(&self.root_uri, lint_options);

*self.server_linter.write().await = Some(server_linter);
Expand Down Expand Up @@ -303,7 +301,15 @@ impl WorkspaceWorker {
let server_linter = server_linter_guard.as_ref()?;
server_linter.get_cached_files_of_diagnostics()
};
self.refresh_server_linter().await;
let lint_options = self
.options
.lock()
.await
.as_ref()
.map(|option| option.lint.clone())
.unwrap_or_default();

self.refresh_server_linter(&lint_options).await;
Some(self.revalidate_diagnostics(files).await)
}

Expand Down Expand Up @@ -363,7 +369,7 @@ impl WorkspaceWorker {
vec![]
}
};
self.refresh_server_linter().await;
self.refresh_server_linter(&changed_options.lint).await;

if current_option.lint.config_path != changed_options.lint.config_path {
return (
Expand Down
Loading