branch: elpa/haskell-tng-mode commit 4217d984faebba791372caa13206f714387337b1 Author: Tseen She <ts33n....@gmail.com> Commit: Tseen She <ts33n....@gmail.com>
fixup! third party tools use project specific PATH --- haskell-tng-extra-lsp-hsinspect.el | 7 +------ haskell-tng-extra-projectile.el | 7 ++++++- haskell-tng-extra-stack.el | 5 ++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/haskell-tng-extra-lsp-hsinspect.el b/haskell-tng-extra-lsp-hsinspect.el index 1117c50..300ff0c 100644 --- a/haskell-tng-extra-lsp-hsinspect.el +++ b/haskell-tng-extra-lsp-hsinspect.el @@ -13,15 +13,10 @@ (require 'lsp-mode) -(defcustom haskell-tng-lsp-hsinspect "hsinspect-lsp" - "The command and args to launch the hsinspect language server." - :group 'haskell-tng - :type 'stringp) - (lsp-register-client (make-lsp-client :new-connection (lsp-stdio-connection - (lambda () haskell-tng-lsp-hsinspect)) + (lambda () (haskell-tng--util-which "hsinspect-lsp"))) :major-modes '(haskell-tng-mode) :server-id 'hsinspect-lsp :multi-root 't diff --git a/haskell-tng-extra-projectile.el b/haskell-tng-extra-projectile.el index b427e35..b71c8db 100644 --- a/haskell-tng-extra-projectile.el +++ b/haskell-tng-extra-projectile.el @@ -9,6 +9,8 @@ (require 'projectile) +(require 'haskell-tng-util) + ;; TODO fix the haskell-stack detection to also include cabal ;; TODO populate the projectile compile/run/test commands @@ -19,7 +21,10 @@ ;; Excluding dist-newstyle means excluding git source deps and generated ;; files, but also gives a bit of a speed boost since it will ignore ;; directories containing object files. - (setq-local projectile-tags-command "fast-tags -Re --exclude=dist-newstyle ."))) + (setq-local projectile-tags-command + (concat + (haskell-tng--util-which "fast-tags") + " -Re --exclude=dist-newstyle .")))) (provide 'haskell-tng-extra-projectile) ;;; haskell-tng-extra-projectile.el ends here diff --git a/haskell-tng-extra-stack.el b/haskell-tng-extra-stack.el index 3ff0627..410441a 100644 --- a/haskell-tng-extra-stack.el +++ b/haskell-tng-extra-stack.el @@ -19,7 +19,10 @@ (setq-default haskell-tng--compile-alt "stack clean" - projectile-tags-command "fast-tags -Re --exclude=.stack-work .") + projectile-tags-command + (concat + (haskell-tng--util-which "fast-tags") + " -Re --exclude=.stack-work .")) (provide 'haskell-tng-extra-stack) ;;; haskell-tng-extra-stack.el ends here