[Rendering] Ensure flattened directories don't temporarily hide git a…

…nnotations.
Alexander-Miller · Oct 16, 2023 · 474febd · 474febd
1 parent 42b9e48
commit 474febd
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/elisp/treemacs-rendering.el b/src/elisp/treemacs-rendering.el
@@ -378,7 +378,15 @@ DIRS: List of Collapse Paths.  Each Collapse Path is a list of
                 (unless (treemacs--non-simple-git-mode-enabled)
                   (add-text-properties
                    beg (point)
-                   '(face treemacs-directory-collapsed-face)))))))))))
+                   '(face treemacs-directory-collapsed-face)))
+                (-when-let* ((ann (treemacs-get-annotation new-path))
+                             (git-cache
+                              (->> original-path
+                                   (treemacs--parent-dir)
+                                   (ht-get treemacs--git-cache))))
+                  (treemacs-button-put
+                   b 'face
+                   (treemacs-annotation->face-value ann)))))))))))
 
 (defmacro treemacs--inplace-map-when-unrolled (items interval &rest mapper)
   "Unrolled in-place mapping operation.