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).
This commit is contained in:
parent
713258ee31
commit
e996216714
2 changed files with 9 additions and 8 deletions
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
(prog1 (lsp-mode 1)
|
||||
(lsp--info
|
||||
"Connected to %s."
|
||||
(apply
|
||||
#'concat (mapcar
|
||||
(lambda (it) (format "[%s]" (lsp--workspace-print it)))
|
||||
lsp--buffer-workspaces))))))
|
||||
lsp--buffer-workspaces)))))))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue