foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): apply specifier rewrite to CompletionItem::text_edit (#21564)

Browse source
This commit is contained in:
Nayeem Rahman 2023-12-15 15:24:38 +00:00 • committed by GitHub
parent fd6044dfec
commit cd480b481e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cli/lsp/tsc.rs
View file

@ -3112,6 +3112,23 @@ impl CompletionEntryDetails {
} else { } else {
None None
}; };
let mut text_edit = original_item.text_edit.clone();
if let Some(specifier_rewrite) = &data.specifier_rewrite {
if let Some(text_edit) = &mut text_edit {
match text_edit {
lsp::CompletionTextEdit::Edit(text_edit) => {
text_edit.new_text = text_edit
.new_text
.replace(&specifier_rewrite.0, &specifier_rewrite.1);
}
lsp::CompletionTextEdit::InsertAndReplace(insert_replace_edit) => {
insert_replace_edit.new_text = insert_replace_edit
.new_text
.replace(&specifier_rewrite.0, &specifier_rewrite.1);
}
}
}
}
let (command, additional_text_edits) = parse_code_actions( let (command, additional_text_edits) = parse_code_actions(
self.code_actions.as_ref(), self.code_actions.as_ref(),
data, data,
@ -3136,6 +3153,7 @@ impl CompletionEntryDetails {
detail, detail,
documentation, documentation,
command, command,
text_edit,
additional_text_edits, additional_text_edits,
insert_text, insert_text,
// NOTE(bartlomieju): it's not entirely clear to me why we need to do that, // NOTE(bartlomieju): it's not entirely clear to me why we need to do that,