Merge pull request #192 from yyoncho/multi-client

lsp-ui multi client changes

Author: yyoncho

lsp-ui-doc.el

@@ -149,8 +149,6 @@ The functions receive 2 parameters: the frame and its window.")
 
 (defvar-local lsp-ui-doc--bounds nil)
 
-(declare-function lsp-ui-sideline--get-renderer 'lsp-ui-sideline)
-
 ;; Avoid warning with emacs < 26
 (declare-function display-buffer-in-child-frame "window.el")
 
@@ -165,8 +163,7 @@ Because some variables are buffer local.")
   "Execute BODY in the lsp-ui-doc buffer."
   `(let ((parent-vars (list :buffer (current-buffer)
                             :window (get-buffer-window)
-                            :workspace-root (when lsp--cur-workspace
-                                              (lsp--workspace-root lsp--cur-workspace)))))
+                            :workspace-root (lsp-workspace-root))))
      (with-current-buffer (get-buffer-create (lsp-ui-doc--make-buffer-name))
        (setq lsp-ui-doc--parent-vars parent-vars)
        (prog1 (let ((buffer-read-only nil))
@@ -230,7 +227,7 @@ MODE is the mode used in the parent frame."
                     (gethash "value" marked-string)))
           (with-lang (hash-table-p marked-string))
           (language (and with-lang (gethash "language" marked-string)))
-          (render-fn (if with-lang (lsp-ui-sideline--get-renderer language)
+          (render-fn (if with-lang (lsp-get-renderer language)
                        (and (functionp lsp-ui-doc-render-function)
                             lsp-ui-doc-render-function)))
           (mode major-mode))
@@ -254,7 +251,7 @@ MODE is the mode used in the parent frame."
 
 (defun lsp-ui-doc--filter-marked-string (list-marked-string)
   (let ((groups (--separate (and (hash-table-p it)
-                                 (lsp-ui-sideline--get-renderer (gethash "language" it)))
+                                 (lsp-get-renderer (gethash "language" it)))
                             (append list-marked-string nil))))
     (when-let ((marked-string (caar groups)))
       ;; Without run-with-idle-timer, echo area will be cleared after displaying the message instantly.
@@ -284,8 +281,7 @@ We don't extract the string that `lps-line' is already displaying."
 (defun lsp-ui-doc--hover (orig-fn)
   "Request the documentation to the LS."
   (if lsp-ui-doc-mode
-      (when (and (bound-and-true-p lsp--cur-workspace)
-                 (not (bound-and-true-p lsp-ui-peek-mode))
+      (when (and (not (bound-and-true-p lsp-ui-peek-mode))
                  (lsp--capability "hoverProvider"))
         (cond
          ((symbol-at-point)

lsp-ui-flycheck.el

@@ -90,7 +90,7 @@ If nil, diagnostics will be reported according to `flycheck-check-syntax-automat
                                       (car (split-string message "\n")))))
                    (add-text-properties 0 (length text) `(diag ,diag file ,file window ,window) text)
                    (insert (concat text "\n")))))
-             lsp--diagnostics))
+             (lsp-diagnostics)))
   (if (= (point) 1)
       (overlay-put (make-overlay 1 1)
                    'after-string "No diagnostic available\n")
@@ -177,11 +177,11 @@ If nil, diagnostics will be reported according to `flycheck-check-syntax-automat
   "Start an LSP syntax check with CHECKER.
 
 CALLBACK is the status callback passed by Flycheck."
-  ;; Turn all errors from lsp--diagnostics for the current buffer into
+  ;; Turn all errors from lsp-diagnostics for the current buffer into
   ;; flycheck-error objects and pass them immediately to the callback
   (let ((errors))
-    (dolist (diag (or (gethash buffer-file-name lsp--diagnostics)
-                      (gethash (file-truename buffer-file-name) lsp--diagnostics)))
+    (dolist (diag (or (gethash buffer-file-name (lsp-diagnostics))
+                      (gethash (file-truename buffer-file-name) (lsp-diagnostics))))
       (push (flycheck-error-new
              :buffer (current-buffer)
              :checker checker

lsp-ui-peek.el

@@ -337,7 +337,7 @@ XREFS is a list of references/definitions."
   (-let* ((xref (lsp-ui-peek--get-selection))
           ((&plist :file file :chunk chunk) (or xref lsp-ui-peek--last-xref))
           (header (concat " " (lsp-ui--workspace-path file) "\n"))
-          (header2 (format " %s %s" lsp-ui-peek--size-list 
+          (header2 (format " %s %s" lsp-ui-peek--size-list
                            (string-remove-prefix "workspace/" (string-remove-prefix "textDocument/" lsp-ui-peek--method))))
           (ref-view (--> chunk
                          (if (eq lsp-ui-peek-fontify 'on-demand)

lsp-ui-sideline.el

@@ -176,21 +176,6 @@ if UP is non-nil, it loops on the previous lines.."
   (seq-do 'delete-overlay lsp-ui-sideline--ovs)
   (setq lsp-ui-sideline--ovs nil))
 
-(defun lsp-ui-sideline--get-renderer (language)
-  "Return a function to fontify a string in LANGUAGE."
-  (thread-last lsp--cur-workspace
-    lsp--workspace-client
-    lsp--client-string-renderers
-    (assoc-string language)
-    cdr))
-
-(defun lsp-ui-sideline--get-language ()
-  "Return the language of the buffer."
-  (thread-first lsp--cur-workspace
-    lsp--workspace-client
-    lsp--client-language-id
-    (funcall (current-buffer))))
-
 (defun lsp-ui-sideline--extract-info (contents)
   "Extract the line to print from CONTENTS.
 CONTENTS can be differents type of values:
@@ -202,11 +187,11 @@ function signature)."
      ((stringp contents) contents)
      ((sequencep contents) ;; MarkedString[]
       (seq-find (lambda (it) (and (hash-table-p it)
-                                  (lsp-ui-sideline--get-renderer (gethash "language" it))))
+                                  (lsp-get-renderer (gethash "language" it))))
                 contents))
      ((gethash "kind" contents) (gethash "value" contents)) ;; MarkupContent
      ((gethash "language" contents) ;; MarkedString
-      (and (lsp-ui-sideline--get-renderer (gethash "language" contents))
+      (and (lsp-get-renderer (gethash "language" contents))
            (gethash "value" contents))))))
 
 (defun lsp-ui-sideline--format-info (marked-string)
@@ -218,7 +203,7 @@ MARKED-STRING is the string returned by `lsp-ui-sideline--extract-info'."
     (when (hash-table-p marked-string)
       (let* ((language (gethash "language" marked-string))
              (value (gethash "value" marked-string))
-             (renderer (lsp-ui-sideline--get-renderer language)))
+             (renderer (lsp-get-renderer language)))
         (setq marked-string (if (and (functionp renderer) value)
                                 (funcall renderer value)
                               value))))
@@ -384,8 +369,7 @@ CURRENT is non-nil when the point is on the symbol."
 It loops on the symbols of the current line and request information
 to the language server."
   (lsp-ui-sideline--delete-ov)
-  (when (and lsp--cur-workspace
-             buffer-file-name)
+  (when buffer-file-name
     (let ((eol (line-end-position))
           (bol (line-beginning-position))
           (tag (lsp-ui-sideline--calculate-tag))

lsp-ui.el

@@ -54,16 +54,14 @@
         (funcall major))
       (ignore-errors
         (font-lock-ensure)))
-    (buffer-string))
-  )
-
+    (buffer-string)))
 
 (defun lsp-ui--workspace-path (path)
   "Return the PATH relative to the workspace.
 If the PATH is not in the workspace, it returns the original PATH."
   (let* ((path (file-truename path))
-         (root (lsp--workspace-root lsp--cur-workspace))
-         (in-workspace (string-prefix-p root path)))
+         (root (lsp-workspace-root path))
+         (in-workspace (and root (string-prefix-p root path))))
     (if in-workspace
         (substring path (length root))
       path)))