Skip to content

fix(oxlint/lsp): use tokio::block_in_place for detroying workspaces #18739

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

Closed
Sysix wants to merge 1 commit into from
Closed

fix(oxlint/lsp): use tokio::block_in_place for detroying workspaces #18739

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
11 changes: 8 additions & 3 deletions apps/oxlint/src/lsp/server_linter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ impl ServerLinterBuilder {

// Setup JS workspace. This must be done before loading any configs
if let Some(external_linter) = &self.external_linter {
let res = (external_linter.create_workspace)(root_path.to_string_lossy().into_owned());
let res = tokio::task::block_in_place(|| {
(external_linter.create_workspace)(root_path.to_string_lossy().into_owned())
});

if let Err(err) = res {
error!("Failed to setup JS workspace:\n{err}\n");
Expand Down Expand Up @@ -295,8 +297,11 @@ impl ToolBuilder for ServerLinterBuilder {
fn shutdown(&self, root_uri: &Uri) {
// Destroy JS workspace
if let Some(external_linter) = &self.external_linter {
let root_path = root_uri.to_file_path().unwrap();
(external_linter.destroy_workspace)(root_path.to_string_lossy().into_owned());
// Use `block_in_place()` to avoid nested async runtime access
tokio::task::block_in_place(|| {
let root_path = root_uri.to_file_path().unwrap();
(external_linter.destroy_workspace)(root_path.to_string_lossy().into_owned());
});
}
}
}
Expand Down
Loading