kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Remove offset_encoding in CompletionItem

Browse source
This commit is contained in:
Philipp Mildenberger 2023-03-20 00:02:41 +01:00
parent 2eeac10755
commit 1d5d5dab47
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
helix-term/src/commands.rs
View file

@ -4269,7 +4269,6 @@ pub fn completion(cx: &mut Context) {
.map(|item| CompletionItem {
item,
language_server_id,
offset_encoding,
resolved: false,
})
.collect();

31
helix-term/src/ui/completion.rs
View file

@ -88,7 +88,6 @@ impl menu::Item for CompletionItem {
pub struct CompletionItem {
pub item: lsp::CompletionItem,
pub language_server_id: usize,
pub offset_encoding: OffsetEncoding,
pub resolved: bool,
}
@ -121,6 +120,7 @@ impl Completion {
doc: &Document,
view_id: ViewId,
item: &CompletionItem,
offset_encoding: OffsetEncoding,
trigger_offset: usize,
include_placeholder: bool,
replace_mode: bool,
@ -143,8 +143,6 @@ impl Completion {
}
};
let offset_encoding = item.offset_encoding;
let Some(range) = util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) else{
return Transaction::new(doc.text());
};
@ -238,8 +236,21 @@ impl Completion {
// always present here
let item = item.unwrap();
let transaction =
item_to_transaction(doc, view.id, item, trigger_offset, true, replace_mode);
let offset_encoding = editor
.language_servers
.get_by_id(item.language_server_id)
.expect("language server disappeared between completion request and application")
.offset_encoding();
let transaction = item_to_transaction(
doc,
view.id,
item,
offset_encoding,
trigger_offset,
true,
replace_mode,
);
doc.apply_temporary(&transaction, view.id);
}
PromptEvent::Validate => {
@ -251,6 +262,12 @@ impl Completion {
// always present here
let mut item = item.unwrap().clone();
let offset_encoding = editor
.language_servers
.get_by_id(item.language_server_id)
.expect("language server disappeared between completion request and application")
.offset_encoding();
let language_server = editor
.language_servers
.get_by_id(item.language_server_id)
@ -270,6 +287,7 @@ impl Completion {
doc,
view.id,
&item,
offset_encoding,
trigger_offset,
false,
replace_mode,
@ -287,7 +305,7 @@ impl Completion {
let transaction = util::generate_transaction_from_edits(
doc.text(),
additional_edits,
item.offset_encoding, // TODO: should probably transcode in Client
offset_encoding, // TODO: should probably transcode in Client
);
doc.apply(&transaction, view.id);
}
@ -414,7 +432,6 @@ impl Completion {
let resolved_item = CompletionItem {
item: resolved_item,
language_server_id: current_item.language_server_id,
offset_encoding: current_item.offset_encoding,
resolved: true,
};