Skip to content

Chore: Enhance candidate filepath list for @ character #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tninja merged 10 commits into from
Feb 5, 2026
Merged

Chore: Enhance candidate filepath list for @ character #155

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7cc528e
visible files logic support out of repo file
tninja Feb 4, 2026
74100af
Normalize file paths and improve relative path handling
tninja Feb 4, 2026
00ee19c
Refactor buffer file list to helper functions for clarity
tninja Feb 4, 2026
8687bd4
Add recent buffer paths to git root candidate paths list
tninja Feb 4, 2026
ccb6e04
Include Dired directories when collecting recent file paths
tninja Feb 4, 2026
a5d9ded
Update ai-code-prompt-mode.el
tninja Feb 4, 2026
3c1cc2c
reorder menu
tninja Feb 4, 2026
9d888db
Merge branch 'kang_feat' of github.com:tninja/ai-code-interface.el in…
tninja Feb 4, 2026
c593dbe
Add test coverage for refactored filepath candidate functions (#156)
Copilot Feb 5, 2026
5c2ef61
Update ai-code-prompt-mode.el
tninja Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 77 additions & 30 deletions ai-code-prompt-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,19 +218,77 @@ NOTE: This does not handle file paths containing spaces."
"Return FILE relative to GIT-ROOT-TRUENAME, prefixed with '@'."
(concat "@" (file-relative-name (file-truename file) git-root-truename)))

(defun ai-code--visible-window-files (git-root-truename)
"Return visible window file list under GIT-ROOT-TRUENAME."
(defun ai-code--normalize-path (file)
"Return normalized absolute path for FILE.
If FILE exists, return its truename. Otherwise return expanded path."
(let ((full (expand-file-name file)))
(if (file-exists-p full)
(file-truename full)
full)))
Comment thread
tninja marked this conversation as resolved.
Comment thread
tninja marked this conversation as resolved.

(defun ai-code--candidate-path (file git-root-truename)
"Return completion candidate for FILE.
Return '@'-prefixed path relative to GIT-ROOT-TRUENAME when FILE is under
that root, otherwise return the absolute path."
(let ((full-truename (ai-code--normalize-path file)))
(if (string-prefix-p git-root-truename full-truename)
(ai-code--relative-filepath full-truename git-root-truename)
full-truename)))
Comment thread
tninja marked this conversation as resolved.

(defun ai-code--current-frame-dired-paths (git-root-truename)
"Return dired directory candidates from current frame under GIT-ROOT-TRUENAME."
(let ((paths '()))
(dolist (win (window-list nil 'no-minibuffer))
(with-current-buffer (window-buffer win)
(when (derived-mode-p 'dired-mode)
(let ((dir (if (fboundp 'dired-current-directory)
(dired-current-directory)
default-directory)))
(when (and dir
(file-directory-p dir)
(string-prefix-p git-root-truename
(file-truename dir))
(not (ai-code--git-ignored-repo-file-p
dir
git-root-truename)))
(push (ai-code--relative-filepath dir
git-root-truename)
Comment thread
tninja marked this conversation as resolved.
paths))))))
(nreverse (delete-dups paths))))

(defun ai-code--visible-window-files ()
"Return files from visible windows in current frame."
(let ((files '())
(selected (selected-window)))
(dolist (win (cons selected
(delq selected (window-list nil 'no-minibuffer))))
(let* ((buf (window-buffer win))
(file (buffer-file-name buf)))
(when (and (ai-code--file-in-git-repo-p file git-root-truename)
(not (ai-code--git-ignored-repo-file-p file git-root-truename)))
(let ((file (buffer-file-name (window-buffer win))))
(when file
(push file files))))
(nreverse (delete-dups files))))

(defun ai-code--recent-buffer-paths (git-root-truename)
"Return candidate paths for most recent 5 visited buffer files."
Comment thread
tninja marked this conversation as resolved.
Outdated
(let ((files '())
(count 0))
(dolist (buf (buffer-list))
(when (< count 5)
(with-current-buffer buf
(if (derived-mode-p 'dired-mode)
(let ((dir (if (fboundp 'dired-current-directory)
(dired-current-directory)
default-directory)))
(when dir
(push dir files)
(setq count (1+ count))))
(let ((file (buffer-file-name buf)))
(when file
(push file files)
(setq count (1+ count))))))))
(mapcar (lambda (file)
Comment thread
tninja marked this conversation as resolved.
(ai-code--candidate-path file git-root-truename))
(nreverse files))))
Comment thread
tninja marked this conversation as resolved.

(defun ai-code--buffer-file-list (git-root-truename &optional skip-files)
"Return buffer file list under GIT-ROOT-TRUENAME, skipping SKIP-FILES."
(let ((files '()))
Expand Down Expand Up @@ -262,39 +320,28 @@ NOTE: This does not handle file paths containing spaces."
(let* ((git-root-truename (file-truename git-root))
(current-file (buffer-file-name (current-buffer)))
(current-frame-dired-paths
(let ((paths '()))
(dolist (win (window-list nil 'no-minibuffer))
(with-current-buffer (window-buffer win)
(when (derived-mode-p 'dired-mode)
(let ((dir (if (fboundp 'dired-current-directory)
(dired-current-directory)
default-directory)))
(when (and dir
(file-directory-p dir)
(string-prefix-p git-root-truename
(file-truename dir))
(not (ai-code--git-ignored-repo-file-p
dir
git-root-truename)))
(push (ai-code--relative-filepath dir
git-root-truename)
paths))))))
(nreverse (delete-dups paths))))
(visible-files (ai-code--visible-window-files git-root-truename))
(skip-files (mapcar #'file-truename visible-files))
(ai-code--current-frame-dired-paths git-root-truename))
(visible-files (ai-code--visible-window-files))
(skip-files (mapcar #'ai-code--normalize-path visible-files))
Comment thread
tninja marked this conversation as resolved.
(buffer-files (ai-code--buffer-file-list git-root-truename skip-files))
(recent-files (ai-code--repo-recent-files git-root-truename))
(ignore-prefix (concat "@" ai-code-files-dir-name "/"))
(visible-paths (mapcar (lambda (file)
(ai-code--relative-filepath file git-root-truename))
(ai-code--candidate-path file git-root-truename))
visible-files))
(recent-buffer-paths
(ai-code--recent-buffer-paths git-root-truename))
(buffer-paths (mapcar (lambda (file)
(ai-code--relative-filepath file git-root-truename))
(ai-code--candidate-path file git-root-truename))
buffer-files))
(recent-paths (mapcar (lambda (file)
(ai-code--relative-filepath file git-root-truename))
(ai-code--candidate-path file git-root-truename))
recent-files))
(combined (append current-frame-dired-paths visible-paths buffer-paths recent-paths))
(combined (append current-frame-dired-paths
visible-paths
recent-buffer-paths
buffer-paths
recent-paths))
(deduped (ai-code--dedupe-preserve-order combined))
(filtered '()))
(dolist (item deduped)
Expand Down
121 changes: 0 additions & 121 deletions test/test_ai-code-prompt-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,41 +364,6 @@ and ensures everything is cleaned up afterward."
(let ((result (ai-code--relative-filepath mock-file-in-repo git-root)))
(should (string= result "@src/main.js")))))

Comment thread
tninja marked this conversation as resolved.
(ert-deftest ai-code-test-visible-window-files ()
"Test that ai-code--visible-window-files returns files from visible windows."
(ai-code-with-test-repo
(let ((test-file-1 (expand-file-name "file1.el" git-root))
(test-file-2 (expand-file-name "file2.el" git-root)))
(unwind-protect
(progn
;; Create test files
(with-temp-file test-file-1 (insert "content1"))
(with-temp-file test-file-2 (insert "content2"))

;; Mock ai-code--git-ignored-repo-file-p to return nil for all files
(cl-letf (((symbol-function 'ai-code--git-ignored-repo-file-p)
(lambda (file root) nil)))

;; Open files in buffers but don't display them
(with-current-buffer (find-file-noselect test-file-1)
(with-current-buffer (find-file-noselect test-file-2)
;; Mock window-list to return windows with these buffers
(cl-letf (((symbol-function 'window-list)
(lambda (&optional frame no-minibuf)
(list (selected-window))))
((symbol-function 'window-buffer)
(lambda (win)
(if (eq win (selected-window))
(get-buffer (file-name-nondirectory test-file-1))
(get-buffer (file-name-nondirectory test-file-2))))))
(let ((result (ai-code--visible-window-files git-root)))
;; Should contain the file from the selected window
(should (member test-file-1 result))))))))

;; Cleanup
(when (file-exists-p test-file-1) (delete-file test-file-1))
(when (file-exists-p test-file-2) (delete-file test-file-2))))))

(ert-deftest ai-code-test-buffer-file-list ()
"Test that ai-code--buffer-file-list returns buffer files excluding skip-files."
(ai-code-with-test-repo
Expand Down Expand Up @@ -503,35 +468,6 @@ and ensures everything is cleaned up afterward."
(when (file-exists-p normal-file) (delete-file normal-file))
(when (file-directory-p ai-files-dir) (delete-directory ai-files-dir))))))

(ert-deftest ai-code-test-prompt-filepath-candidates-prioritizes-visible-windows ()
"Test that ai-code--prompt-filepath-candidates prioritizes visible window files."
(ai-code-with-test-repo
(let ((visible-file (expand-file-name "visible.el" git-root))
(buffer-file (expand-file-name "buffer.el" git-root)))
(unwind-protect
(progn
;; Create test files
(with-temp-file visible-file (insert "visible"))
(with-temp-file buffer-file (insert "buffer"))

;; Mock dependencies
(cl-letf (((symbol-function 'ai-code--git-ignored-repo-file-p)
(lambda (file root) nil))
((symbol-function 'ai-code--visible-window-files)
(lambda (root) (list visible-file)))
((symbol-function 'ai-code--buffer-file-list)
(lambda (root skip) (list buffer-file)))
((symbol-function 'ai-code--repo-recent-files)
(lambda (root) '())))

(let ((candidates (ai-code--prompt-filepath-candidates)))
;; Visible file should come before buffer file
(should (equal candidates '("@visible.el" "@buffer.el"))))))

;; Cleanup
(when (file-exists-p visible-file) (delete-file visible-file))
(when (file-exists-p buffer-file) (delete-file buffer-file))))))

(ert-deftest ai-code-test-prompt-filepath-capf-returns-candidates-after-at ()
"Test that ai-code--prompt-filepath-capf returns candidates when '@' is typed."
(ai-code-with-test-repo
Expand Down Expand Up @@ -791,62 +727,5 @@ and ensures everything is cleaned up afterward."
;; Should return nil (in minibuffer)
(should-not result))))))

(ert-deftest ai-code-test-prompt-filepath-candidates-includes-dired-directories ()
"Test that ai-code--prompt-filepath-candidates includes dired directories from current frame."
(ai-code-with-test-repo
(let ((dired-dir-1 (expand-file-name "src/" git-root))
(dired-dir-2 (expand-file-name "test/" git-root))
(test-file (expand-file-name "file.el" git-root))
(dired-buf-1 nil)
(dired-buf-2 nil))
(unwind-protect
(progn
;; Create test directories and file
(make-directory dired-dir-1 t)
(make-directory dired-dir-2 t)
(with-temp-file test-file (insert "content"))

;; Open dired buffers and display them in windows
(setq dired-buf-1 (dired-noselect dired-dir-1))
(setq dired-buf-2 (dired-noselect dired-dir-2))

;; Display dired buffers in windows to simulate visible frame
(switch-to-buffer dired-buf-1)
(split-window)
(other-window 1)
(switch-to-buffer dired-buf-2)

;; Mock dependencies
(cl-letf (((symbol-function 'ai-code--git-ignored-repo-file-p)
(lambda (_file _root) nil))
((symbol-function 'ai-code--visible-window-files)
(lambda (_root) '()))
((symbol-function 'ai-code--buffer-file-list)
(lambda (_root _skip) (list test-file)))
((symbol-function 'ai-code--repo-recent-files)
(lambda (_root) '())))

(let ((candidates (ai-code--prompt-filepath-candidates)))
;; Both dired directories should be included in candidates
(should (member "@src/" candidates))
(should (member "@test/" candidates))
;; Test file should also be included
(should (member "@file.el" candidates))
;; Dired directories should come before buffer files
(let ((src-pos (cl-position "@src/" candidates :test #'string=))
(test-pos (cl-position "@test/" candidates :test #'string=))
(file-pos (cl-position "@file.el" candidates :test #'string=)))
(should (< src-pos file-pos))
(should (< test-pos file-pos))))))

;; Cleanup
(when (buffer-live-p dired-buf-1) (kill-buffer dired-buf-1))
(when (buffer-live-p dired-buf-2) (kill-buffer dired-buf-2))
(when (file-exists-p test-file) (delete-file test-file))
(when (file-directory-p dired-dir-1) (delete-directory dired-dir-1))
(when (file-directory-p dired-dir-2) (delete-directory dired-dir-2))
;; Restore window configuration
(delete-other-windows)))))

(provide 'test-ai-code-prompt-mode)
;;; test_ai-code-prompt-mode.el ends here