From e9962167143c1c781276dbe4e669d0ccaf1b1942 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 2 Sep 2019 21:43:12 -0400 Subject: [PATCH] Have lsp! return non-nil if successful And fix an issue where +javascript-init-lsp-or-tide-maybe-h would reference lsp-mode in the rare case where lsp-mode isn't defined (likely because the user forgot to run `doom refresh` after enabling the :tools lsp module). --- modules/lang/javascript/config.el | 3 ++- modules/tools/lsp/autoload.el | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index a569871b5..6f45eaccf 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -146,7 +146,8 @@ to tide." ;; file-visiting buffer (add-hook 'after-save-hook #'+javascript-init-tide-or-lsp-maybe-h nil 'local) (or (and (featurep! +lsp) - (progn (lsp!) lsp-mode)) + (lsp!) + (bound-and-true-p lsp-mode)) ;; 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 7b6baffd6..944a4e289 100644 --- a/modules/tools/lsp/autoload.el +++ b/modules/tools/lsp/autoload.el @@ -21,10 +21,10 @@ been moved out to their respective modules, or these hooks: (lsp--try-project-root-workspaces (equal arg '(4)) (and arg (not (equal arg 1))))))) - (lsp-mode 1) - (lsp--info - "Connected to %s." - (apply - #'concat (mapcar - (lambda (it) (format "[%s]" (lsp--workspace-print it))) - lsp--buffer-workspaces)))))) + (prog1 (lsp-mode 1) + (lsp--info + "Connected to %s." + (apply + #'concat (mapcar + (lambda (it) (format "[%s]" (lsp--workspace-print it))) + lsp--buffer-workspaces)))))))