Properly implement labelDetails for 3.17

Author: wyuenho

lsp-completion.el

@@ -67,17 +67,11 @@ ignored."
   :group 'lsp-completion
   :package-version '(lsp-mode . "7.0.1"))
 
-(defcustom lsp-completion-show-detail t
+(defcustom lsp-completion-show-detail nil
   "Whether or not to show detail of completion candidates."
   :type 'boolean
   :group 'lsp-completion)
 
-(defcustom lsp-completion-show-label-description t
-  "Whether or not to show description of completion candidates."
-  :type 'boolean
-  :group 'lsp-completion
-  :package-version '(lsp-mode . "9.0.0"))
-
 (defcustom lsp-completion-no-cache nil
   "Whether or not caching the returned completions from server."
   :type 'boolean
@@ -246,24 +240,41 @@ The CLEANUP-FN will be called to cleanup."
         (funcall callback completion-item)
         (when cleanup-fn (funcall cleanup-fn))))))
 
-(defun lsp-completion--get-label-detail (item)
+(defun lsp-completion--get-label-detail (item &optional omit-description)
   "Construct label detail from completion item ITEM."
-  (-let (((completion-item &as &CompletionItem :detail? :kind? :label-details?)
-          item))
-    (concat (when (and lsp-completion-show-detail detail?)
-              (concat " " (s-replace "\r" "" detail?)))
-            (when (and lsp-completion-show-label-description label-details?)
-              (when-let* ((description (and label-details? (lsp:label-details-description label-details?))))
-                (format " %s" description)))
-            (when lsp-completion-show-kind
-              (when-let* ((kind-name (and kind? (aref lsp-completion--item-kind kind?))))
-                (format " (%s)" kind-name))))))
+  (-let (((&CompletionItem :detail? :label-details?) item))
+    (cond ((and label-details?
+                (or (lsp:label-details-detail? label-details?)
+                    (lsp:label-details-description? label-details?)))
+           (-let (((&LabelDetails :detail? :description?) label-details?))
+             (concat
+              (unless (and lsp-completion-show-detail
+                           detail?
+                           (string-prefix-p " " detail?))
+                " ")
+              (when lsp-completion-show-detail
+                (s-replace "\r" "" detail?))
+              (unless (or omit-description
+                          (and description? (string-prefix-p " " description?)))
+                " ")
+              (unless omit-description
+                description?))))
+          (lsp-completion-show-detail
+           (concat (unless (and detail? (string-prefix-p " " detail?))
+                     " ")
+                   (s-replace "\r" "" detail?))))))
 
 (defun lsp-completion--annotate (cand)
   "Annotation function for completion candidate CAND.
 
 Returns unresolved completion item detail."
-  (lsp-completion--get-label-detail (get-text-property 0 'lsp-completion-unresolved-item cand)))
+  (when-let ((lsp-completion-item (get-text-property 0 'lsp-completion-unresolved-item cand)))
+    (concat
+     (lsp-completion--get-label-detail lsp-completion-item)
+     (when lsp-completion-show-kind
+       (when-let* ((kind? (lsp:completion-item-kind? lsp-completion-item))
+                   (kind-name (and kind? (aref lsp-completion--item-kind kind?))))
+         (format " (%s)" kind-name))))))
 
 (defun lsp-completion--looking-back-trigger-characterp (trigger-characters)
   "Return character if text before point match any of the TRIGGER-CHARACTERS."
@@ -467,7 +478,9 @@ The MARKERS and PREFIX value will be attached to each candidate."
 
 Returns resolved completion item details."
   (and (lsp-completion--resolve cand)
-       (lsp-completion--get-label-detail (get-text-property 0 'lsp-completion-item cand))))
+       (lsp-completion--get-label-detail
+        (get-text-property 0 'lsp-completion-item cand)
+        t)))
 
 (defun lsp-completion--get-documentation (item)
   "Get doc comment for completion ITEM."

lsp-protocol.el

@@ -667,7 +667,6 @@ See `-let' for a description of the destructuring mechanism."
  (FormattingOptions (:tabSize :insertSpaces) (:trimTrailingWhitespace :insertFinalNewline :trimFinalNewlines))
  (HoverCapabilities nil (:contentFormat :dynamicRegistration))
  (ImplementationCapabilities nil (:dynamicRegistration :linkSupport))
- (LabelDetails (:detail :description) nil)
  (LinkedEditingRanges (:ranges) (:wordPattern))
  (Location (:range :uri) nil)
  (MarkedString (:language :value) nil)
@@ -824,6 +823,7 @@ See `-let' for a description of the destructuring mechanism."
  (WillSaveTextDocumentParams (:reason :textDocument) nil)
  (WorkspaceSymbolParams (:query) nil)
  ;; 3.17
+ (LabelDetails nil (:detail :description))
  (InlayHint (:label :position) (:kind :paddingLeft :paddingRight))
  (InlayHintLabelPart (:value) (:tooltip :location :command))
  (InlayHintsParams (:textDocument) (:range))