diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-06-05 11:04:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-05 17:04:16 +0200 |
commit | 7ed90a20d04982ae15a52ae2378cbffd4b6839df (patch) | |
tree | 3297d6f7227fbf1cf80e17a2a376ef4dfa52e6ad /cli/lsp/language_server.rs | |
parent | 0544d60012006b1c7799d8b6eafacec9567901ad (diff) |
fix: better handling of npm resolution occurring on workers (#24094)
Closes https://github.com/denoland/deno/issues/24063
Diffstat (limited to 'cli/lsp/language_server.rs')
-rw-r--r-- | cli/lsp/language_server.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index e362a9e7e..466c5b430 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -1317,7 +1317,7 @@ impl Inner { move || { let format_result = match document.maybe_parsed_source() { Some(Ok(parsed_source)) => { - format_parsed_source(&parsed_source, &fmt_options) + format_parsed_source(parsed_source, &fmt_options) } Some(Err(err)) => Err(anyhow!("{:#}", err)), None => { @@ -1330,12 +1330,12 @@ impl Inner { .map(|ext| file_path.with_extension(ext)) .unwrap_or(file_path); // it's not a js/ts file, so attempt to format its contents - format_file(&file_path, &document.content(), &fmt_options) + format_file(&file_path, document.content(), &fmt_options) } }; match format_result { Ok(Some(new_text)) => Some(text::get_edits( - &document.content(), + document.content(), &new_text, document.line_index().as_ref(), )), @@ -1605,7 +1605,9 @@ impl Inner { &specifier, diagnostic, asset_or_doc.document().map(|d| d.text_info()), - asset_or_doc.maybe_parsed_source().and_then(|r| r.ok()), + asset_or_doc + .maybe_parsed_source() + .and_then(|r| r.as_ref().ok()), ) .map_err(|err| { error!("Unable to fix lint error: {:#}", err); |