From 7a1e56e7d1a7086765f5810993012c52512060dc Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 24 Aug 2020 11:19:47 +0100 Subject: Prefer simpler, more idiomatic project-find-function This version avoids installed all of the custom `cl-defmethods` for a `'monorepo` type and instead uses the existing `'transient`. --- emacs/.emacs.d/wpc/wpc-misc.el | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'emacs/.emacs.d/wpc/wpc-misc.el') diff --git a/emacs/.emacs.d/wpc/wpc-misc.el b/emacs/.emacs.d/wpc/wpc-misc.el index fd65dc21485c..5b21ec410892 100644 --- a/emacs/.emacs.d/wpc/wpc-misc.el +++ b/emacs/.emacs.d/wpc/wpc-misc.el @@ -207,31 +207,12 @@ (defun project-find-function--briefcase (dir) "Find the nearest default.nix file; otherwise, terminate at the .git directory." - (let ((filenames (->> dir f-files (-map #'f-filename))) - (dirnames (->> dir f-directories (-map #'f-dirname)))) - (if (or (-contains? filenames "default.nix") - (-contains? dirnames ".git")) - (cons 'monorepo dir) - (if (f-parent dir) - (project-find-function--briefcase (f-parent dir)) - nil)))) + (when (s-starts-with? (getenv "BRIEFCASE") (f-expand dir)) + (if (f-exists? (f-join dir "default.nix")) + (cons 'transient dir) + (project-find-function--briefcase (f-parent dir))))) -(cl-defmethod project-root ((project (head monorepo))) - (cdr project)) - -(cl-defmethod project-roots ((project (head monorepo))) - (list (cdr project))) - -(cl-defmethod project-external-roots ((project (head monorepo))) - (project-external-roots (cons 'vc (cdr project)))) - -(cl-defmethod project-ignores ((project (head monorepo)) dir) - (project-ignores (cons 'vc (cdr project)) dir)) - -(cl-defmethod project-files ((project (head monorepo)) &optional dirs) - (project-files (cons 'vc (cdr project)) dirs)) - -(setq project-find-functions (list #'project-find-function--briefcase)) +(add-to-list 'project-find-functions #'project-find-function--briefcase) (use-package deadgrep :config -- cgit 1.4.1