diff --git a/core/autoload/projects.el b/core/autoload/projects.el index 9fed5c423..6d68c2c46 100644 --- a/core/autoload/projects.el +++ b/core/autoload/projects.el @@ -2,8 +2,7 @@ (defvar projectile-project-root nil) -;;;###autoload -(autoload 'projectile-relevant-known-projects "projectile") +;;;###autoload (autoload 'projectile-relevant-known-projects "projectile") ;;;###autodef (cl-defun set-project-type! (name &key predicate compile run test configure dir) @@ -24,22 +23,12 @@ ;;; Macros ;;;###autoload -(defmacro without-project-cache! (&rest body) - "Run BODY with projectile's project-root cache disabled. This is necessary if -you want to interactive with a project other than the one you're in." - `(let ((projectile-project-root-cache (make-hash-table :test 'equal)) - projectile-project-name - projectile-project-root - projectile-require-project-root) - ,@body)) - -;;;###autoload -(defmacro project-file-exists-p! (files) +(defun doom-project-file-exists-p (files) "Checks if the project has the specified FILES. Paths are relative to the project root, unless they start with ./ or ../ (in which case they're relative to `default-directory'). If they start with a slash, they are absolute." - `(file-exists-p! ,files (doom-project-root))) + (file-exists-p! files (doom-project-root))) ;; diff --git a/modules/tools/lookup/autoload/lookup.el b/modules/tools/lookup/autoload/lookup.el index 57359f1c1..25db27e47 100644 --- a/modules/tools/lookup/autoload/lookup.el +++ b/modules/tools/lookup/autoload/lookup.el @@ -297,22 +297,24 @@ Otherwise, falls back on `find-file-at-point'." (find-file-at-point path)) ((not (+lookup--jump-to :file path)) - (let ((fullpath (expand-file-name path))) + (let ((fullpath (doom-path path))) (when (and buffer-file-name (file-equal-p fullpath buffer-file-name)) (user-error "Already here")) (let* ((insert-default-directory t) (project-root (doom-project-root)) (ffap-file-finder - (cond ((not (file-directory-p fullpath)) + (cond ((not (doom-glob fullpath)) #'find-file) ((ignore-errors (file-in-directory-p fullpath project-root)) (lambda (dir) - (let ((default-directory dir)) - (without-project-cache! - (let ((file (projectile-completing-read "Find file: " - (projectile-current-project-files) - :initial-input path))) - (find-file (expand-file-name file (doom-project-root))) - (run-hooks 'projectile-find-file-hook)))))) + (let* ((default-directory dir) + projectile-project-name + projectile-project-root + (projectile-project-root-cache (make-hash-table :test 'equal)) + (file (projectile-completing-read "Find file: " + (projectile-current-project-files) + :initial-input path))) + (find-file (expand-file-name file (doom-project-root))) + (run-hooks 'projectile-find-file-hook)))) (#'doom-project-browse)))) (find-file-at-point path))))))