Unnamed repository; edit this file 'description' to name the repository.
fix: add fallback for completion label details
Andrew Hlynskyi 2023-11-25
parent 34cffbf · commit 94cea46
-rw-r--r--crates/ide-completion/src/item.rs2
-rw-r--r--crates/rust-analyzer/src/lsp/to_proto.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/crates/ide-completion/src/item.rs b/crates/ide-completion/src/item.rs
index 5397a9fc90..99b895eed4 100644
--- a/crates/ide-completion/src/item.rs
+++ b/crates/ide-completion/src/item.rs
@@ -26,7 +26,7 @@ use crate::{
pub struct CompletionItem {
/// Label in the completion pop up which identifies completion.
pub label: SmolStr,
- /// Addition label details in the completion pop up that are
+ /// Additional label details in the completion pop up that are
/// displayed and aligned on the right side after the label.
pub label_detail: Option<SmolStr>,
diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
index b4ba5bf4f9..fb366fd5cc 100644
--- a/crates/rust-analyzer/src/lsp/to_proto.rs
+++ b/crates/rust-analyzer/src/lsp/to_proto.rs
@@ -304,6 +304,8 @@ fn completion_item(
detail: item.label_detail.as_ref().map(ToString::to_string),
description: lsp_item.detail.clone(),
});
+ } else if let Some(label_detail) = item.label_detail {
+ lsp_item.label.push_str(label_detail.as_str());
}
set_score(&mut lsp_item, max_relevance, item.relevance);