Fixed several issues regarding lsp-treemacs-render

Author: yyoncho

lsp-treemacs.el

@@ -158,8 +158,8 @@
   (-let [(&DocumentSymbol :kind :children?) symbol]
     (concat
      (if (seq-empty-p children?)
-         "   "
-       (if expanded  " ▾ " " ▸ "))
+         "  "
+       (if expanded  "▾ " "▸ "))
      (lsp-treemacs-symbol-icon kind))))
 
 (treemacs-define-expandable-node lsp-symbol
@@ -414,7 +414,7 @@ will be rendered an empty line between them."
   "Get the symbol for the the kind."
   (-let (((&hash "uri" "kind" "entryKind" entry-kind) dep))
     (concat
-     (if expanded  " ▾ " " ▸ ")
+     (if expanded  "▾ " "▸ ")
      (if (or (= kind 8)
              (= kind 6))
          (treemacs-icon-for-file uri)
@@ -698,10 +698,11 @@ will be rendered an empty line between them."
                                        (puthash node-key (cons t result) lsp-treemacs--generic-cache)
                                        (let ((lsp-treemacs-use-cache t))
                                          (treemacs-update-node (cons :custom node-key) t)))))))
-                      (or (cl-rest (gethash node-key lsp-treemacs--generic-cache))
-                          `((:label ,(propertize "Loading..." 'face 'shadow)
-                                    :icon-literal " "
-                                    :key "Loading..."))))
+                      (if-let ((cache (gethash node-key lsp-treemacs--generic-cache)))
+                          (cl-rest cache)
+                        `((:label ,(propertize "Loading..." 'face 'shadow)
+                                  :icon-literal " "
+                                  :key "Loading..."))))
                      (t children)))
   :ret-action #'lsp-treemacs-perform-ret-action
   :render-action
@@ -728,11 +729,12 @@ will be rendered an empty line between them."
 
 (defun lsp-treemacs--generic-icon (item expanded?)
   "Get the symbol for the the kind."
+  (message ">>>  %s exp = %s" (plist-get item :label) expanded?)
   (concat
    (if (or (plist-get item :children)
            (plist-get item :children-async))
-       (if expanded?  " ▾ " " ▸ ")
-     "   ")
+       (if expanded?  "▾ " "▸ ")
+     "  ")
    (or (plist-get item :icon-literal)
        (if-let ((icon (plist-get item :icon)))
            (treemacs-get-icon-value
@@ -881,13 +883,16 @@ will be rendered an empty line between them."
                                    (interactive)
                                    (lsp-treemacs--open-file-in-mru path)))))))
 
-(defun lsp-treemacs-render (tree title expand-depth &optional buffer-name right-click-actions)
+(defun lsp-treemacs-render (tree title expand-depth &optional buffer-name right-click-actions clear-cache?)
   (let ((search-buffer (get-buffer-create (or buffer-name "*LSP Lookup*"))))
     (with-current-buffer search-buffer
       (lsp-treemacs-initialize)
       (setq-local treemacs-default-visit-action 'treemacs-RET-action)
       (setq-local lsp-treemacs--right-click-actions right-click-actions)
-      (setq-local lsp-treemacs--generic-cache (or lsp-treemacs--generic-cache (ht)))
+      (setq-local lsp-treemacs--generic-cache (if (and lsp-treemacs--generic-cache
+                                                       (not clear-cache?))
+                                                  lsp-treemacs--generic-cache
+                                                (ht)))
       (setq-local lsp-treemacs-tree tree)
       (setq-local face-remapping-alist '((button . default)))
       (lsp-treemacs--set-mode-line-format search-buffer title)
@@ -979,7 +984,7 @@ With a prefix argument, select the new window expand the tree of implementations
           callback
           (seq-map
            (-lambda (node)
-             (-let* (((child-item &as &CallHierarchyItem :name :kind :detail? :uri :selection-range (&Range :start))
+             (-let* (((child-item &as &CallHierarchyItem :kind :uri :selection-range (&Range :start))
                       (if outgoing
                           (lsp:call-hierarchy-outgoing-call-to node)
                         (lsp:call-hierarchy-incoming-call-from node)))
@@ -1026,8 +1031,7 @@ With a prefix argument, show the outgoing call hierarchy."
         (lsp-request "textDocument/prepareCallHierarchy"
                      (lsp--text-document-position-params)))
        (concat (if outgoing "Outgoing" "Incoming") " Call Hierarchy")
-       nil
-       "*Call Hierarchy*") nil))))
+       nil "*Call Hierarchy*" nil t) nil))))