Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lsp: fix completion_item something_to_resolve not being a latch to true #18247

Merged
merged 1 commit into from
Oct 9, 2024
Merged

lsp: fix completion_item something_to_resolve not being a latch to true #18247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions crates/rust-analyzer/src/lsp/to_proto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ fn completion_item(
let mut something_to_resolve = false;

let filter_text = if fields_to_resolve.resolve_filter_text {
something_to_resolve = !item.lookup().is_empty();
something_to_resolve |= !item.lookup().is_empty();
None
} else {
Some(item.lookup().to_owned())
};

let text_edit = if fields_to_resolve.resolve_text_edit {
something_to_resolve = true;
something_to_resolve |= true;
None
} else {
// LSP does not allow arbitrary edits in completion, so we have to do a
Expand Down Expand Up @@ -319,14 +319,14 @@ fn completion_item(

let insert_text_format = item.is_snippet.then_some(lsp_types::InsertTextFormat::SNIPPET);
let tags = if fields_to_resolve.resolve_tags {
something_to_resolve = item.deprecated;
something_to_resolve |= item.deprecated;
None
} else {
item.deprecated.then(|| vec![lsp_types::CompletionItemTag::DEPRECATED])
};
let command = if item.trigger_call_info && config.client_commands().trigger_parameter_hints {
if fields_to_resolve.resolve_command {
something_to_resolve = true;
something_to_resolve |= true;
None
} else {
Some(command::trigger_parameter_hints())
Expand All @@ -336,14 +336,14 @@ fn completion_item(
};

let detail = if fields_to_resolve.resolve_detail {
something_to_resolve = item.detail.is_some();
something_to_resolve |= item.detail.is_some();
None
} else {
item.detail
};

let documentation = if fields_to_resolve.resolve_documentation {
something_to_resolve = item.documentation.is_some();
something_to_resolve |= item.documentation.is_some();
None
} else {
item.documentation.map(documentation)
Expand All @@ -366,7 +366,7 @@ fn completion_item(

if config.completion_label_details_support() {
if fields_to_resolve.resolve_label_details {
something_to_resolve = true;
something_to_resolve |= true;
} else {
lsp_item.label_details = Some(lsp_types::CompletionItemLabelDetails {
detail: item.label_detail.as_ref().map(ToString::to_string),
Expand Down