emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #1765: enabling tide when lsp is active

Browse source
This commit is contained in:
Henrik Lissner 2019-09-08 12:55:23 -04:00
parent 1539387747
commit d0e3bc3455
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/lang/javascript/config.el
View file

@ -145,9 +145,7 @@ to tide."
;; necessary because `tide-setup' and `lsp' will error if not a ;; necessary because `tide-setup' and `lsp' will error if not a
;; file-visiting buffer ;; file-visiting buffer
(add-hook 'after-save-hook #'+javascript-init-tide-or-lsp-maybe-h nil 'local) (add-hook 'after-save-hook #'+javascript-init-tide-or-lsp-maybe-h nil 'local)
(or (and (featurep! +lsp) (or (and (featurep! +lsp) (lsp!))
(lsp!)
(bound-and-true-p lsp-mode))
;; fall back to tide ;; fall back to tide
(if (executable-find "node") (if (executable-find "node")
(and (require 'tide nil t) (and (require 'tide nil t)

3
modules/tools/lsp/autoload.el
View file

@ -10,8 +10,9 @@ been moved out to their respective modules, or these hooks:
+ `+lsp-init-company-h' (on `lsp-mode-hook') + `+lsp-init-company-h' (on `lsp-mode-hook')
+ `+lsp-init-ui-flycheck-or-flymake-h' (on `lsp-ui-mode-hook')" + `+lsp-init-ui-flycheck-or-flymake-h' (on `lsp-ui-mode-hook')"
(if (bound-and-true-p lsp-mode)
t
(require 'lsp-mode) (require 'lsp-mode)
(unless lsp-mode
(when lsp-auto-configure (when lsp-auto-configure
(require 'lsp-clients)) (require 'lsp-clients))
(when (and (buffer-file-name) (when (and (buffer-file-name)