From a2ca21cc215864bb0ab9e70d02130287533dba5b Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 19 Jun 2017 00:03:37 +0200
Subject: [PATCH] Add doom*project-root advice fn

---
 core/core-projects.el             | 5 +++++
 modules/lang/javascript/config.el | 4 +---
 modules/lang/typescript/config.el | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/core-projects.el b/core/core-projects.el
index 87166780f..eff926d3b 100644
--- a/core/core-projects.el
+++ b/core/core-projects.el
@@ -77,6 +77,11 @@ state are passed in.")
   (let ((projectile-require-project-root strict-p))
     (ignore-errors (projectile-project-root))))
 
+(defun doom*project-root (&rest _)
+  "An advice function used to replace project-root-detection functions in other
+libraries."
+  (doom-project-root))
+
 (defmacro doom-project-has! (files)
   "Checks if the project has the specified FILES, relative to the project root,
 unless the path begins with ./ or ../, in which case it's relative to
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 2feb8dee6..c3d74e4df 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -87,9 +87,7 @@
   :commands tern-mode
   :init (add-hook 'js2-mode-hook #'tern-mode)
   :config
-  ;; Fix project detection
-  (defun +javascript*tern-project-dir (&rest _) (doom-project-root))
-  (advice-add #'tern-project-dir :override #'+javascript*tern-project-dir))
+  (advice-add #'tern-project-dir :override #'doom*project-root))
 
 
 (def-package! company-tern
diff --git a/modules/lang/typescript/config.el b/modules/lang/typescript/config.el
index 9783e9186..7c7258fbd 100644
--- a/modules/lang/typescript/config.el
+++ b/modules/lang/typescript/config.el
@@ -27,8 +27,6 @@
       (eldoc-mode +1)))
   (add-hook! (typescript-mode web-mode) #'+typescript|tide-setup)
 
-  (advice-add #'tide-project-root :override #'doom-project-root)
-
   (map! :map typescript-mode-map
         :m "gd" #'tide-jump-to-definition
         :localleader
@@ -41,5 +39,7 @@
   (set! :company-backend 'typescript-mode '(company-tide))
   (setq tide-format-options
         '(:insertSpaceAfterFunctionKeywordForAnonymousFunctions t
-          :placeOpenBraceOnNewLineForFunctions nil)))
+          :placeOpenBraceOnNewLineForFunctions nil))
+
+  (advice-add #'tide-project-root :override #'doom*project-root))