emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove "fix" for projectile + $HOME git repos

Browse source 
There are legitimate reasons why a user would want to treat $HOME as a
project. 'doom doctor' now complains about this case in greater detail.
I'll leave it to users to deal with this edge case.
This commit is contained in:
Henrik Lissner 2021-05-23 21:55:20 -04:00
parent 3a0bf17f2f
commit e5b52e2a50
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/cli/doctor.el
View file

@ -139,8 +139,12 @@ in."
(require 'projectile) (require 'projectile)
(when (projectile-project-root "~") (when (projectile-project-root "~")
(warn! "Your $HOME is recognized as a project root") (warn! "Your $HOME is recognized as a project root")
(explain! "Doom will disable bottom-up root search, which may reduce the accuracy of project\n" (explain! "Emacs will assume $HOME is the root of any project living under $HOME. If this isn't\n"
"detection.")) "desired, you will need to remove \".git\" from `projectile-project-root-files-bottom-up'\n"
"(a variable), e.g.\n\n"
" (after! projectile\n"
" (setq projectile-project-root-files-bottom-up\n"
" (remove \".git\" projectile-project-root-files-bottom-up)))"))
;; There should only be one ;; There should only be one
(when (and (file-equal-p doom-private-dir "~/.config/doom") (when (and (file-equal-p doom-private-dir "~/.config/doom")

13
core/core-projects.el
View file

@ -138,19 +138,6 @@ c) are not valid projectile projects."
and do (remhash proot projectile-project-type-cache)) and do (remhash proot projectile-project-type-cache))
(projectile-serialize-cache)))) (projectile-serialize-cache))))
;; It breaks projectile's project root resolution if HOME is a project (e.g.
;; it's a git repo). In that case, we disable bottom-up root searching to
;; prevent issues. This makes project resolution a little slower and less
;; accurate in some cases.
(let ((default-directory "~"))
(when (cl-find-if #'projectile-file-exists-p
projectile-project-root-files-bottom-up)
(doom-log "HOME appears to be a project. Disabling bottom-up root search.")
(setq projectile-project-root-files
(append projectile-project-root-files-bottom-up
projectile-project-root-files)
projectile-project-root-files-bottom-up nil)))
;; Some MSYS utilities auto expanded the `/' path separator, so we need to prevent it. ;; Some MSYS utilities auto expanded the `/' path separator, so we need to prevent it.
(when IS-WINDOWS (when IS-WINDOWS
(setenv "MSYS_NO_PATHCONV" "1") ; Fix path in Git Bash (setenv "MSYS_NO_PATHCONV" "1") ; Fix path in Git Bash