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

tools/lsp: start lsp server unconditionally

Browse source 
Part 2 of f6d3ee588, in order for server restarting to work, since
shutting down the server doesn't turn off lsp-mode.
This commit is contained in:
Henrik Lissner 2019-11-02 15:50:26 -04:00
parent f6d3ee5889
commit 16a17ad970
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
modules/tools/lsp/config.el
View file

@ -74,27 +74,26 @@ been moved out to their respective modules, or these hooks:
Also logs the resolved project root, if found."
:override #'lsp
(interactive "P")
(if (bound-and-true-p lsp-mode) t
(require 'lsp-mode)
(when lsp-auto-configure
(require 'lsp-clients))
(and (buffer-file-name)
(setq-local
lsp--buffer-workspaces
(or (lsp--try-open-in-library-workspace)
(lsp--try-project-root-workspaces
(equal arg '(4))
(and arg (not (equal arg 1))))))
(prog1 (lsp-mode 1)
;; Announce what project root we're using, for diagnostic purposes
(if-let (root (lsp--calculate-root (lsp-session) (buffer-file-name)))
(lsp--info "Guessed project root is %s" (abbreviate-file-name root))
(lsp--info "Could not guess project root."))
(lsp--info "Connected to %s."
(apply #'concat
(mapcar
(lambda (it) (format "[%s]" (lsp--workspace-print it)))
lsp--buffer-workspaces)))))))
(require 'lsp-mode)
(when lsp-auto-configure
(require 'lsp-clients))
(and (buffer-file-name)
(setq-local
lsp--buffer-workspaces
(or (lsp--try-open-in-library-workspace)
(lsp--try-project-root-workspaces
(equal arg '(4))
(and arg (not (equal arg 1))))))
(prog1 (lsp-mode 1)
;; Announce what project root we're using, for diagnostic purposes
(if-let (root (lsp--calculate-root (lsp-session) (buffer-file-name)))
(lsp--info "Guessed project root is %s" (abbreviate-file-name root))
(lsp--info "Could not guess project root."))
(lsp--info "Connected to %s."
(apply #'concat
(mapcar
(lambda (it) (format "[%s]" (lsp--workspace-print it)))
lsp--buffer-workspaces))))))
;; Don't prompt to restart LSP servers while quitting Emacs
(add-hook! 'kill-emacs-hook (setq lsp-restart 'ignore)))