From d0e3bc345589daca8842afd9b9d77b167a44f229 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 8 Sep 2019 12:55:23 -0400 Subject: [PATCH] Fix #1765: enabling tide when lsp is active --- modules/lang/javascript/config.el | 4 +--- modules/tools/lsp/autoload.el | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index fb4add54b..55e8daff1 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -145,9 +145,7 @@ to tide." ;; necessary because `tide-setup' and `lsp' will error if not a ;; file-visiting buffer (add-hook 'after-save-hook #'+javascript-init-tide-or-lsp-maybe-h nil 'local) - (or (and (featurep! +lsp) - (lsp!) - (bound-and-true-p lsp-mode)) + (or (and (featurep! +lsp) (lsp!)) ;; fall back to tide (if (executable-find "node") (and (require 'tide nil t) diff --git a/modules/tools/lsp/autoload.el b/modules/tools/lsp/autoload.el index 944a4e289..b84f6bf9d 100644 --- a/modules/tools/lsp/autoload.el +++ b/modules/tools/lsp/autoload.el @@ -10,8 +10,9 @@ been moved out to their respective modules, or these hooks: + `+lsp-init-company-h' (on `lsp-mode-hook') + `+lsp-init-ui-flycheck-or-flymake-h' (on `lsp-ui-mode-hook')" - (require 'lsp-mode) - (unless lsp-mode + (if (bound-and-true-p lsp-mode) + t + (require 'lsp-mode) (when lsp-auto-configure (require 'lsp-clients)) (when (and (buffer-file-name)