Merge pull request #3 from abo-abo/master

Use ivy-update-candidates

Author: sebastiansturm

lsp-ivy.el

@@ -34,11 +34,11 @@
 
 (defun lsp-ivy--format-symbol-match (match)
   "Convert the (hash-valued) MATCH returned by `lsp-mode` into a candidate string."
-  (let ((containerName (gethash "containerName" match))
+  (let ((container-name (gethash "containerName" match))
         (name (gethash "name" match)))
-    (if (string-empty-p containerName)
+    (if (or (null container-name) (string-empty-p container-name))
         name
-      (format "%s.%s" containerName name))))
+      (format "%s.%s" container-name name))))
 
 (defun lsp-ivy--workspace-symbol-action (candidate)
   "Jump to selected CANDIDATE."
@@ -51,42 +51,39 @@
 
 (defun lsp-ivy--workspace-symbol (workspaces prompt initial-input)
   "Search against WORKSPACES with PROMPT and INITIAL-INPUT."
-  (let (;; contains current user input, followed by the string representations
-        ;; of all currently available candidates
-        (candidates)
-        (current-request-id))
+  (let ((candidates nil)
+        (current-request-id nil))
     (ivy-read
      prompt
-     (lambda (user-input &rest args)
-       (if (string= user-input (car candidates))
-           (--map (lsp-ivy--format-symbol-match it) (cdr candidates))
-         (ignore
-          (with-lsp-workspaces workspaces
-            (-let (((request &as &plist :id request-id)
-                    (lsp-make-request
-                     "workspace/symbol"
-                     (list :query user-input))))
-              (when current-request-id
-                (lsp--cancel-request current-request-id))
-              (setq current-request-id request-id)
-              (lsp-send-request-async
-               request
-               (lambda (incoming-candidates)
-                 (setq candidates (cons user-input incoming-candidates))
-                 (let (ivy--old-text)
-                   (ivy--exhibit)))
-               :mode 'detached))))))
+     (lambda (user-input)
+       (with-lsp-workspaces workspaces
+         (let ((request (lsp-make-request
+                         "workspace/symbol"
+                         (list :query user-input))))
+           (when current-request-id
+             (lsp--cancel-request
+              current-request-id))
+           (setq current-request-id
+                 (plist-get request :id))
+           (lsp-send-request-async
+            request
+            (lambda (incoming-candidates)
+              (ivy-update-candidates
+               (mapcar
+                #'lsp-ivy--format-symbol-match
+                (setq candidates incoming-candidates))))
+            :mode 'detached)))
+       0)
      :dynamic-collection t
      :require-match t
      :initial-input initial-input
      :action (lambda (result)
                (let ((match
-                      (--find
-                       (string-equal result (lsp-ivy--format-symbol-match it))
-                       ;; KLUDGE: remove current query, find candidate
-                       ;; corresponding to selected candidate by linear search
-                       (-drop 1 candidates))))
-                 (when match (lsp-ivy--workspace-symbol-action match)))))))
+                      (cl-find-if
+                       (lambda (it) (string-equal result (lsp-ivy--format-symbol-match it)))
+                       candidates)))
+                 (when match
+                   (lsp-ivy--workspace-symbol-action match)))))))
 
 ;;;###autoload
 (defun lsp-ivy-workspace-symbol (arg)