Merge pull request #2104 from lem-project/feat/filer-git-status

feat(filer): add git status display integration

Author: cxxxr

extensions/git-gutter/git-gutter.lisp

@@ -271,7 +271,10 @@
             'git-gutter-on-change)
   ;; Add directory-mode support
   (add-directory-mode-inserter)
-  (update-all-directory-buffers))
+  (update-all-directory-buffers)
+  ;; Add filer support
+  (add-filer-inserter)
+  (update-filer-buffer))
 
 (defun disable-hook ()
   "Called when git-gutter-mode is disabled."
@@ -284,6 +287,9 @@
   (clear-all-buffers)
   ;; Remove directory-mode support and clear cache
   (remove-directory-mode-inserter)
+  ;; Remove filer support
+  (remove-filer-inserter)
+  (update-filer-buffer)
   (clear-directory-status-cache))
 
 (define-minor-mode git-gutter-mode
@@ -503,12 +509,56 @@
   "Clear the directory git status cache."
   (clrhash *directory-git-status-cache*))
 
+;;; Filer Git Status Support
+
+(defun insert-filer-git-status (point item root-directory)
+  "Inserter function for filer to show git status."
+  (let* ((pathname (lem/filer:item-pathname item))
+         (status (when (and pathname root-directory)
+                   (get-file-git-status pathname root-directory))))
+    (multiple-value-bind (char attr)
+        (status-to-display status)
+      (if attr
+          (insert-string point (format nil "~A " char) :attribute attr)
+          (insert-string point "  ")))))
+
+(defun add-filer-inserter ()
+  "Add git status inserter to filer."
+  (when (find-package :lem/filer)
+    (let ((inserters (find-symbol "*FILER-ITEM-INSERTERS*" :lem/filer)))
+      (when (and inserters (boundp inserters))
+        (unless (member #'insert-filer-git-status (symbol-value inserters))
+          (push #'insert-filer-git-status (symbol-value inserters)))))))
+
+(defun remove-filer-inserter ()
+  "Remove git status inserter from filer."
+  (when (find-package :lem/filer)
+    (let ((inserters (find-symbol "*FILER-ITEM-INSERTERS*" :lem/filer)))
+      (when (and inserters (boundp inserters))
+        (setf (symbol-value inserters)
+              (remove #'insert-filer-git-status (symbol-value inserters)))))))
+
+(defun update-filer-buffer ()
+  "Update filer buffer to reflect git status changes."
+  (when (find-package :lem/filer)
+    (let ((filer-buffer-fn (find-symbol "FILER-BUFFER" :lem/filer))
+          (root-item-fn (find-symbol "ROOT-ITEM" :lem/filer))
+          (render-fn (find-symbol "RENDER" :lem/filer)))
+      (when (and filer-buffer-fn (fboundp filer-buffer-fn)
+                 root-item-fn (fboundp root-item-fn)
+                 render-fn (fboundp render-fn))
+        (alexandria:when-let ((buffer (funcall filer-buffer-fn)))
+          (alexandria:when-let ((root (funcall root-item-fn buffer)))
+            (funcall render-fn buffer root)))))))
+
 (define-command git-gutter-refresh-directory-status () ()
-  "Refresh git status cache for current directory buffer."
+  "Refresh git status cache for current directory buffer and filer."
   (let ((directory (buffer-directory (current-buffer))))
     (when directory
       (remhash (namestring directory) *directory-git-status-cache*)
       ;; Force redisplay of directory buffer if in directory-mode
       (when (eq (buffer-major-mode (current-buffer)) 'lem/directory-mode:directory-mode)
         (update-buffer (current-buffer)))
+      ;; Also update filer buffer
+      (update-filer-buffer)
       (message "Git status refreshed"))))

extensions/git-gutter/tests/git-gutter-tests.lisp

@@ -370,3 +370,39 @@ D	deleted.lisp")
   "Test parsing empty output"
   (let ((status (gutter:parse-git-diff-name-status "")))
     (ok (= (hash-table-count status) 0) "Empty output should have no entries")))
+
+;;; Test filer integration functions
+
+(deftest test-filer-inserter-functions-exist
+  "Test that filer integration functions exist"
+  (ok (fboundp 'lem-git-gutter::insert-filer-git-status)
+      "insert-filer-git-status should be defined")
+  (ok (fboundp 'lem-git-gutter::add-filer-inserter)
+      "add-filer-inserter should be defined")
+  (ok (fboundp 'lem-git-gutter::remove-filer-inserter)
+      "remove-filer-inserter should be defined")
+  (ok (fboundp 'lem-git-gutter::update-filer-buffer)
+      "update-filer-buffer should be defined"))
+
+(deftest test-filer-inserter-registration
+  "Test that filer inserter can be added and removed"
+  (when (find-package :lem/filer)
+    (let* ((inserters-sym (find-symbol "*FILER-ITEM-INSERTERS*" :lem/filer))
+           (original-value (when (and inserters-sym (boundp inserters-sym))
+                             (symbol-value inserters-sym))))
+      (when (and inserters-sym (boundp inserters-sym))
+        (unwind-protect
+            (progn
+              ;; Clear and test add
+              (setf (symbol-value inserters-sym) '())
+              (lem-git-gutter::add-filer-inserter)
+              (ok (member #'lem-git-gutter::insert-filer-git-status
+                          (symbol-value inserters-sym))
+                  "insert-filer-git-status should be in *filer-item-inserters*")
+              ;; Test remove
+              (lem-git-gutter::remove-filer-inserter)
+              (ok (not (member #'lem-git-gutter::insert-filer-git-status
+                               (symbol-value inserters-sym)))
+                  "insert-filer-git-status should be removed from *filer-item-inserters*"))
+          ;; Restore original value
+          (setf (symbol-value inserters-sym) original-value))))))

src/ext/filer.lisp

@@ -9,9 +9,17 @@
            :directory-item-open-p
            :directory-item-children
            :file-item
-           :item-pathname))
+           :item-pathname
+           :*filer-item-inserters*
+           :root-item
+           :render
+           :filer-buffer))
 (in-package :lem/filer)
 
+(defparameter *filer-item-inserters* '()
+  "List of functions to call before inserting filer items.
+Each function takes (point item root-directory) arguments.")
+
 (define-attribute triangle-attribute
   (t :bold t :foreground :base0D))
 
@@ -103,6 +111,11 @@
 (defun insert-item (point item)
   (with-point ((start point))
     (back-to-indentation start)
+    ;; Call registered inserters for pluggable extensions (e.g., git status)
+    (let ((root-directory (alexandria:when-let ((root (root-item (point-buffer point))))
+                            (item-pathname root))))
+      (dolist (inserter *filer-item-inserters*)
+        (funcall inserter point item root-directory)))
     (lem/directory-mode/internal::insert-icon point (item-pathname item))
     (insert-string point
                    (item-content item)

tests/filer.lisp

@@ -80,6 +80,27 @@
     (let ((root (create-directory-item #P"/tmp/")))
       (ng (expand-to-directory root #P"/var/")))))
 
+;;; Test *filer-item-inserters*
+(deftest filer-item-inserters-test
+  (testing "*filer-item-inserters* exists and is initially empty"
+    (ok (boundp 'lem/filer:*filer-item-inserters*))
+    (ok (listp lem/filer:*filer-item-inserters*)))
+
+  (testing "inserters can be added and removed"
+    (let ((original-value lem/filer:*filer-item-inserters*))
+      (unwind-protect
+          (let ((test-inserter (lambda (point item root-directory)
+                                 (declare (ignore point item root-directory)))))
+            ;; Add inserter
+            (push test-inserter lem/filer:*filer-item-inserters*)
+            (ok (member test-inserter lem/filer:*filer-item-inserters*))
+            ;; Remove inserter
+            (setf lem/filer:*filer-item-inserters*
+                  (remove test-inserter lem/filer:*filer-item-inserters*))
+            (ok (not (member test-inserter lem/filer:*filer-item-inserters*))))
+        ;; Restore original value
+        (setf lem/filer:*filer-item-inserters* original-value)))))
+
 ;;; Note: Tests for filer-active-p, filer-buffer, filer-current-directory,
 ;;; and highlight-file-in-filer are not included here because they require
 ;;; a full editor environment with *implementation* bound.