Add support for clangd >= 17

Previous commit broke other language servers
zed-industries · Feb 23, 2025 · ec25928 · ec25928
1 parent c2ac54d
commit ec25928
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
@@ -120,11 +120,20 @@ impl super::LspAdapter for CLspAdapter {
         completion: &lsp::CompletionItem,
         language: &Arc<Language>,
     ) -> Option<CodeLabel> {
+        let label_detail = 
+            match &completion.label_details {
+                Some(label_detail) => match &label_detail.detail {
+                    Some(detail) => detail.trim(),
+                    None => "",
+                },
+                None => "",
+            };
+
         let label = completion
             .label
             .strip_prefix('•')
             .unwrap_or(&completion.label)
-            .trim();
+            .trim().to_owned() + label_detail;
 
         match completion.kind {
             Some(lsp::CompletionItemKind::FIELD) if completion.detail.is_some() => {

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
@@ -708,7 +708,7 @@ impl LanguageServer {
                                 ],
                             }),
                             insert_replace_support: Some(true),
-                            label_details_support: Some(false),
+                            label_details_support: Some(true),
                             ..Default::default()
                         }),
                         completion_list: Some(CompletionListCapability {