Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Buffer::apply_lsp_edits

Browse source 
Always use `edits_from_lsp`.
This commit is contained in:
Max Brunsfeld 2022-02-11 16:18:06 -08:00
parent d4b9d9e820
commit d84fc3beec
2 changed files with 7 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/project/src/project.rs
View file

@ -1404,11 +1404,16 @@ impl Project {
let resolved_completion = lang_server
.request::<lsp::request::ResolveCompletionItem>(completion.lsp_completion)
.await?;
if let Some(additional_edits) = resolved_completion.additional_text_edits {
if let Some(edits) = resolved_completion.additional_text_edits {
let edits = buffer_handle
.update(&mut cx, |buffer, cx| buffer.edits_from_lsp(edits, None, cx))
.await?;
buffer_handle.update(&mut cx, |buffer, cx| {
buffer.finalize_last_transaction();
buffer.start_transaction();
buffer.apply_lsp_edits(additional_edits, None, cx).log_err();
for (range, text) in edits {
buffer.edit([range], text, cx);
}
let transaction = if buffer.end_transaction(cx).is_some() {
let transaction = buffer.finalize_last_transaction().unwrap().clone();
if !push_to_history {