Change to use lsp-workspace-folders

Author: ericdallo

lsp-treemacs.el

@@ -1208,51 +1208,44 @@ With prefix 2 show both."
                             count)))
        (seq-some #'identity)))
 
-(defun lsp-treemacs--build-error-list (folders)
-  (-keep
-   (lambda (folder)
-     (when-let ((diags (append (lsp-diagnostics-stats-for folder) ())))
-       (when (lsp-treemacs-errors--diags? diags)
-         (list :label (format
-                       (propertize "%s %s %s" 'face 'default)
-                       (f-filename folder)
-                       (->> diags
-                         (-map-indexed
-                          (lambda (index count)
-                            (when (and (not (zerop count))
-                                       (<= index lsp-treemacs-error-list-severity))
-                              (propertize
-                               (number-to-string count)
-                               'face (alist-get index lsp-treemacs-file-face-map)))))
-                         (-filter #'identity)
-                         (s-join "/"))
-                       (propertize (f-dirname folder)
-                                   'face 'lsp-lens-face))
-               :id folder
-               :icon 'root
-               :children (-partial #'lsp-treemacs-errors--list-files folder)
-               :ret-action (lambda (&rest _)
-                             (interactive)
-                             (lsp-treemacs--open-file-in-mru folder))))))
-   folders))
-
-
-(defvar lsp-treemacs--current-project-roots nil)
+(defun lsp-treemacs--build-error-list (folder)
+  (when-let ((diags (append (lsp-diagnostics-stats-for folder) ())))
+    (when (lsp-treemacs-errors--diags? diags)
+      (list :label (format
+                    (propertize "%s %s %s" 'face 'default)
+                    (f-filename folder)
+                    (->> diags
+                      (-map-indexed
+                       (lambda (index count)
+                         (when (and (not (zerop count))
+                                    (<= index lsp-treemacs-error-list-severity))
+                           (propertize
+                            (number-to-string count)
+                            'face (alist-get index lsp-treemacs-file-face-map)))))
+                      (-filter #'identity)
+                      (s-join "/"))
+                    (propertize (f-dirname folder)
+                                'face 'lsp-lens-face))
+            :id folder
+            :icon 'root
+            :children (-partial #'lsp-treemacs-errors--list-files folder)
+            :ret-action (lambda (&rest _)
+                          (interactive)
+                          (lsp-treemacs--open-file-in-mru folder))))))
+
+(defvar lsp-treemacs--current-workspaces nil)
 
 (defun lsp-treemacs-errors-list--refresh ()
-  (message "->%s" lsp-treemacs--current-project-roots)
   (lsp-treemacs-render
-   (if (and lsp-treemacs--current-project-roots
-            lsp-treemacs-error-list-current-project-only)
-       (->> (lsp-session)
-            (lsp-session-folders)
-            (-filter (lambda (folder)
-                       (--any (f-equal-p it folder)
-                              lsp-treemacs--current-project-roots)))
-            (lsp-treemacs--build-error-list))
-     (->> (lsp-session)
-          (lsp-session-folders)
-          (lsp-treemacs--build-error-list)))
+   (if lsp-treemacs-error-list-current-project-only
+       (->> lsp-treemacs--current-workspaces
+            (-map #'lsp-workspace-folders)
+            (-flatten)
+            (-keep #'lsp-treemacs--build-error-list))
+     (->> lsp-treemacs--current-workspaces
+          (-map #'lsp-workspace-folders)
+          (-flatten)
+          (-keep #'lsp-treemacs--build-error-list)))
    "Errors List"
    nil
    lsp-treemacs-errors-buffer-name
@@ -1261,7 +1254,7 @@ With prefix 2 show both."
 ;;;###autoload
 (defun lsp-treemacs-errors-list ()
   (interactive)
-  (setq lsp-treemacs--current-project-roots (-map #'lsp--workspace-root (lsp-workspaces)))
+  (setq lsp-treemacs--current-workspaces (lsp-workspaces))
   (-if-let (buffer (get-buffer lsp-treemacs-errors-buffer-name))
       (progn
         (select-window (display-buffer-in-side-window buffer '((side . bottom))))