foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-09 21:57:40 -04:00
Code Issues Packages 1 Wiki Activity

fix(lsp): silence errors from "codeAction/resolve" (#28400)

Browse source
This commit is contained in:
Nayeem Rahman 2025-03-06 18:00:44 +00:00 • committed by GitHub
parent e6637ab6f1
commit e579440170
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
cli/lsp/language_server.rs
View file

@ -2070,7 +2070,7 @@ impl Inner {
})?;
let asset_or_doc = self.get_asset_or_document(&action_data.specifier)?;
let line_index = asset_or_doc.line_index();
let mut refactor_edit_info = self
let refactor_edit_info = self
.ts_server
.get_edits_for_refactor(
self.snapshot(),
@ -2083,8 +2083,8 @@ impl Inner {
.into(),
line_index.offset_tsc(action_data.range.start)?
..line_index.offset_tsc(action_data.range.end)?,
action_data.refactor_name,
action_data.action_name,
action_data.refactor_name.clone(),
action_data.action_name.clone(),
Some(tsc::UserPreferences::from_config_for_specifier(
&self.config,
&action_data.specifier,
@ -2103,22 +2103,34 @@ impl Inner {
);
LspError::invalid_request()
}
})?;
if kind_suffix == ".rewrite.function.returnType"
|| kind_suffix == ".move.newFile"
{
refactor_edit_info.edits =
fix_ts_import_changes(&refactor_edit_info.edits, self, token)
.map_err(|err| {
if token.is_cancelled() {
LspError::request_cancelled()
} else {
error!("Unable to fix import changes: {:#}", err);
LspError::internal_error()
}
})?
});
match refactor_edit_info {
Ok(mut refactor_edit_info) => {
if kind_suffix == ".rewrite.function.returnType"
|| kind_suffix == ".move.newFile"
{
refactor_edit_info.edits =
fix_ts_import_changes(&refactor_edit_info.edits, self, token)
.map_err(|err| {
if token.is_cancelled() {
LspError::request_cancelled()
} else {
error!("Unable to fix import changes: {:#}", err);
LspError::internal_error()
}
})?
}
code_action.edit =
refactor_edit_info.to_workspace_edit(self, token)?;
}
Err(err) => {
if token.is_cancelled() {
return Err(LspError::request_cancelled());
} else {
lsp_warn!("Unable to get refactor edit info from TypeScript: {:#}\nCode action data: {:#}", err, json!(&action_data));
}
}
}
code_action.edit = refactor_edit_info.to_workspace_edit(self, token)?;
code_action
} else {
// The code action doesn't need to be resolved