msyds/sydnix
1
0
Fork 0
Code Issues 6 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(emacs): syd-insert-file-name accurately label colliding paths

Browse Source
This commit is contained in:
Madeleine Sydney Slaga
2026-04-23 07:37:49 -06:00
parent 312fa1e42c
commit 05fd169c91
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/home/users/msyds/emacs/lisp/syd/prelude.el
View File

@@ -193,11 +193,13 @@ form."
(cons mode (intern (concat (match-string 1 s) "-ts-mode")))) (cons mode (intern (concat (match-string 1 s) "-ts-mode"))))
(error "Symbol `%c' is not a mode." mode)))) (error "Symbol `%c' is not a mode." mode))))
(defun syd--insert-file-name-annotation (x) (defun syd--insert-file-name-annotation (descs)
(when descs
(let ((s (string-join descs ", ")))
(concat (concat
" " " "
(propertize " " 'display `(space :align-to (- right ,(+ 1 (length x))))) (propertize " " 'display `(space :align-to (- right ,(+ 1 (length s)))))
x)) s))))
(defun syd-project-relative-file-name (file-name) (defun syd-project-relative-file-name (file-name)
(file-relative-name file-name (project-root (project-current)))) (file-relative-name file-name (project-root (project-current))))
@@ -231,9 +233,12 @@ form."
`(metadata `(metadata
(annotation-function (annotation-function
. ,(lambda (s) . ,(lambda (s)
(when-let* ((desc (cdr (assoc s alts)))) (let ((descs
(cl-loop for (p . lbl) in alts
when (equal p s)
collect lbl)))
(syd--insert-file-name-annotation (syd--insert-file-name-annotation
desc)))))) descs))))))
(_ (all-completions s (mapcar #'car alts) p))))))) (_ (all-completions s (mapcar #'car alts) p)))))))
(if (equal choice choose-a-dir) (if (equal choice choose-a-dir)
(insert (file-relative-name (insert (file-relative-name