lsp-completion--annotate: support async completion resolve

Author: kiennq

lsp-completion.el

@@ -177,10 +177,56 @@ This will help minimize popup flickering issue in `company-mode'."
                 'lsp-completion-markers markers
                 'lsp-completion-prefix prefix)))
 
+(defun lsp-completion--fix-resolve-data (item)
+  "Patch `CompletionItem' ITEM for rust-analyzer otherwise resolve will fail.
+See #2675"
+  (let ((data (lsp:completion-item-data? item)))
+    (when (lsp-member? data :import_for_trait_assoc_item)
+      (unless (lsp-get data :import_for_trait_assoc_item)
+        (lsp-put data :import_for_trait_assoc_item :json-false)))))
+
+(defun lsp-completion--resolve (item)
+  "Resolve completion ITEM."
+  (cl-assert item nil "Completion item must not be nil")
+  (lsp-completion--fix-resolve-data item)
+  (or (ignore-errors
+        (when (lsp-feature? "completionItem/resolve")
+          (lsp-request "completionItem/resolve"
+                       (lsp-delete (lsp-copy item) :_emacsStartPoint))))
+      item))
+
+(defun lsp-completion--resolve-async (item callback &optional cleanup-fn)
+  "Resolve completion ITEM asynchronously with CALLBACK.
+The CLEANUP-FN will be called to cleanup."
+  (cl-assert item nil "Completion item must not be nil")
+  (lsp-completion--fix-resolve-data item)
+  (ignore-errors
+    (if (lsp-feature? "completionItem/resolve")
+        (lsp-request-async "completionItem/resolve"
+                           (lsp-delete (lsp-copy item) :_emacsStartPoint)
+                           (lambda (result)
+                             (funcall callback result)
+                             (when cleanup-fn (funcall cleanup-fn)))
+                           :error-handler (lambda (err)
+                                            (when cleanup-fn (funcall cleanup-fn))
+                                            (error (lsp:json-error-message err)))
+                           :cancel-handler cleanup-fn
+                           :mode 'alive)
+      (funcall callback item)
+      (when cleanup-fn (funcall cleanup-fn)))))
+
 (defun lsp-completion--annotate (item)
   "Annotate ITEM detail."
-  (-let (((&CompletionItem :detail? :kind? :label-details?) (plist-get (text-properties-at 0 item)
-                                                       'lsp-completion-item)))
+  (-let (((completion-item &as &CompletionItem :detail? :kind? :label-details?)
+          (get-text-property 0 'lsp-completion-item item)))
+    (unless (get-text-property 0 'lsp-completion-resolved item)
+      (lsp-completion--resolve-async
+       completion-item
+       (lambda (resolved-item)
+         (let ((len (length item)))
+           (put-text-property 0 len 'lsp-completion-item resolved-item item)
+           (put-text-property 0 len 'lsp-completion-resolved t item)))))
+
     (concat (when (and lsp-completion-show-detail detail?)
               (concat " " (s-replace "\r" "" detail?)))
             (when (and lsp-completion-show-label-description label-details?)
@@ -705,44 +751,6 @@ The return is nil or in range of (0, inf)."
     (unless (zerop len)
       (/ score-numerator (1+ score-denominator) 1.0))))
 
-(defun lsp-completion--fix-resolve-data (item)
-  "Patch `CompletionItem' ITEM for rust-analyzer otherwise resolve will fail.
-See #2675"
-  (let ((data (lsp:completion-item-data? item)))
-    (when (lsp-member? data :import_for_trait_assoc_item)
-      (unless (lsp-get data :import_for_trait_assoc_item)
-        (lsp-put data :import_for_trait_assoc_item :json-false)))))
-
-(defun lsp-completion--resolve (item)
-  "Resolve completion ITEM."
-  (cl-assert item nil "Completion item must not be nil")
-  (lsp-completion--fix-resolve-data item)
-  (or (ignore-errors
-        (when (lsp-feature? "completionItem/resolve")
-          (lsp-request "completionItem/resolve"
-                       (lsp-delete (lsp-copy item) :_emacsStartPoint))))
-      item))
-
-(defun lsp-completion--resolve-async (item callback &optional cleanup-fn)
-  "Resolve completion ITEM asynchronously with CALLBACK.
-The CLEANUP-FN will be called to cleanup."
-  (cl-assert item nil "Completion item must not be nil")
-  (lsp-completion--fix-resolve-data item)
-  (ignore-errors
-    (if (lsp-feature? "completionItem/resolve")
-        (lsp-request-async "completionItem/resolve"
-                           (lsp-delete (lsp-copy item) :_emacsStartPoint)
-                           (lambda (result)
-                             (funcall callback result)
-                             (when cleanup-fn (funcall cleanup-fn)))
-                           :error-handler (lambda (err)
-                                            (when cleanup-fn (funcall cleanup-fn))
-                                            (error (lsp:json-error-message err)))
-                           :cancel-handler cleanup-fn
-                           :mode 'alive)
-      (funcall callback item)
-      (when cleanup-fn (funcall cleanup-fn)))))
-
 
 ;;;###autoload
 (defun lsp-completion--enable ()