From d3a12a3914956e83040d50e52fa2ff5ee57081bd Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 9 Apr 2019 03:13:18 -0400
Subject: [PATCH] Refactor projects api

Improves correctness of projectile project state. Namely, prevents
projectile-project-root from poisoning the return value of
doom-project-root or doom-project-p, which may be causing an elusive bug
where doom-project-find-file is searching the wrong directory.
---
 core/autoload/projects.el | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/core/autoload/projects.el b/core/autoload/projects.el
index 74c872a30..e8ee56312 100644
--- a/core/autoload/projects.el
+++ b/core/autoload/projects.el
@@ -13,6 +13,7 @@
 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))
 
@@ -55,24 +56,33 @@ they are absolute."
 ;; Library
 
 ;;;###autoload
-(defalias 'doom-project-p #'projectile-project-p)
+(defun doom-project-p (&optional dir)
+  "Return t if DIR (defaults to `default-directory') is a valid project."
+  (and (doom-project-root dir)
+       t))
 
 ;;;###autoload
-(defalias 'doom-project-root #'projectile-project-root)
+(defun doom-project-root (&optional dir)
+  "Return the project root of DIR (defaults to `default-directory').
+Returns nil if not in a project."
+  (let ((projectile-project-root (unless dir projectile-project-root))
+        projectile-require-project-root)
+    (projectile-project-root dir)))
 
 ;;;###autoload
 (defun doom-project-name (&optional dir)
-  "Return the name of the current project."
-  (let ((project-root (or (projectile-project-root dir)
-                          (if dir (expand-file-name dir)))))
-    (if project-root
-        (funcall projectile-project-name-function project-root)
-      "-")))
+  "Return the name of the current project.
+
+Returns '-' if not in a valid project."
+  (if-let* ((project-root (or (doom-project-root dir)
+                              (if dir (expand-file-name dir)))))
+      (funcall projectile-project-name-function project-root)
+    "-"))
 
 ;;;###autoload
 (defun doom-project-expand (name &optional dir)
   "Expand NAME to project root."
-  (expand-file-name name (projectile-project-root dir)))
+  (expand-file-name name (doom-project-root dir)))
 
 ;;;###autoload
 (defun doom-project-find-file (dir)
@@ -82,10 +92,10 @@ Will resolve to the nearest project root above DIR. If no project can be found,
 the search will be rooted from DIR."
   (unless (file-directory-p dir)
     (error "Directory %S does not exist" dir))
-  (let* ((default-directory (file-truename (expand-file-name dir)))
-         (projectile-project-root
-          (or (projectile-project-root)
-              default-directory)))
+  (let ((default-directory (file-truename (expand-file-name dir)))
+        (projectile-project-root
+         (or (doom-project-root dir)
+             default-directory)))
     (call-interactively
      ;; Intentionally avoid `helm-projectile-find-file', because it runs
      ;; asynchronously, and thus doesn't see the lexical `default-directory'