foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 15:24:46 -05:00
Code Issues Packages 1 Wiki Activity

perf(lsp): format in a blocking task (#19883)

Browse source
This commit is contained in:
David Sherret 2023-07-20 09:28:40 -04:00 committed by GitHub
parent 0c3bbf7acd
commit 1ee6218e48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cli/lsp/language_server.rs
View file

@ -1638,9 +1638,14 @@ impl Inner {
return Ok(None); return Ok(None);
} }
let format_result = match document.maybe_parsed_source() { // spawn a blocking task to allow doing other work while this is occurring
let format_result = deno_core::task::spawn_blocking({
let fmt_options = self.fmt_options.options.clone();
let document = document.clone();
move || {
match document.maybe_parsed_source() {
Some(Ok(parsed_source)) => { Some(Ok(parsed_source)) => {
format_parsed_source(&parsed_source, &self.fmt_options.options) format_parsed_source(&parsed_source, &fmt_options)
} }
Some(Err(err)) => Err(anyhow!("{}", err)), Some(Err(err)) => Err(anyhow!("{}", err)),
None => { None => {
@ -1653,9 +1658,13 @@ impl Inner {
.map(|ext| file_path.with_extension(ext)) .map(|ext| file_path.with_extension(ext))
.unwrap_or(file_path); .unwrap_or(file_path);
// it's not a js/ts file, so attempt to format its contents // it's not a js/ts file, so attempt to format its contents
format_file(&file_path, &document.content(), &self.fmt_options.options) format_file(&file_path, &document.content(), &fmt_options)
} }
}; }
}
})
.await
.unwrap();
let text_edits = match format_result { let text_edits = match format_result {
Ok(Some(new_text)) => Some(text::get_edits( Ok(Some(new_text)) => Some(text::get_edits(