mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-13 13:48:50 +00:00
Auto merge of #18247 - jhgg:lsp/fix-something-to-resolve, r=Veykril
lsp: fix completion_item something_to_resolve not being a latch to true while looking at #18245 i noticed that `something_to_resolve` could technically flap between true -> false if some subsequent fields that were requested to be resolved were empty. this fixes that by using `|=` instead of `=` when assigning to `something_to_resolve` which will prevent it from going back to false once set. although some cases it's simply assigning to `true` i opted to continue to use `|=` there for uniformity sake. but happy to change those back to `=`'s. cc `@SomeoneToIgnore`
This commit is contained in:
commit
7692c82e0b
1 changed files with 7 additions and 7 deletions
|
@ -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
|
||||
|
@ -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())
|
||||
|
@ -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)
|
||||
|
@ -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),
|
||||
|
|
Loading…
Reference in a new issue