From d5ca0015786f727087f94815f0611876d0922a2a Mon Sep 17 00:00:00 2001 From: Jason Boatman Date: Wed, 23 Oct 2024 12:57:11 -0500 Subject: [PATCH 1/2] Fix checking for `false` `labelDetailsSupport` value. --- crates/rust-analyzer/src/lsp/capabilities.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/rust-analyzer/src/lsp/capabilities.rs b/crates/rust-analyzer/src/lsp/capabilities.rs index 3b19284f2411..871cde58dce0 100644 --- a/crates/rust-analyzer/src/lsp/capabilities.rs +++ b/crates/rust-analyzer/src/lsp/capabilities.rs @@ -212,7 +212,8 @@ impl ClientCapabilities { .label_details_support .as_ref() })() - .is_some() + .copied() + .unwrap_or_default() } fn completion_item(&self) -> Option { From eed86dd5973b2fbe9947e1c48b7c63a3a7dadea4 Mon Sep 17 00:00:00 2001 From: Jason Boatman Date: Wed, 23 Oct 2024 13:19:53 -0500 Subject: [PATCH 2/2] Rewrite `label_details_support` condition to be consistent with other parts of the codebase. --- crates/rust-analyzer/src/lsp/capabilities.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/rust-analyzer/src/lsp/capabilities.rs b/crates/rust-analyzer/src/lsp/capabilities.rs index 871cde58dce0..939593dd4533 100644 --- a/crates/rust-analyzer/src/lsp/capabilities.rs +++ b/crates/rust-analyzer/src/lsp/capabilities.rs @@ -210,10 +210,7 @@ impl ClientCapabilities { .completion_item .as_ref()? .label_details_support - .as_ref() - })() - .copied() - .unwrap_or_default() + })() == Some(true) } fn completion_item(&self) -> Option {