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

Only enable lsp keymap binding when +bindings

Browse source
This commit is contained in:
James Ravn 2020-05-04 10:12:17 +01:00
parent fb3c6f9d78
commit 4f3cf24afb
No known key found for this signature in database
GPG key ID: 52C372C72159D6EE
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,10 @@ working on that project after closing the last buffer.")
;; For `lsp-clients' ;; For `lsp-clients'
(setq lsp-server-install-dir (concat doom-etc-dir "lsp/") (setq lsp-server-install-dir (concat doom-etc-dir "lsp/")
lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/")) lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/"))
;; Let doom bind the LSP keymap.
(setq lsp-keymap-prefix nil) (when (featurep! :config default +bindings)
;; Let doom bind the lsp keymap.
(setq lsp-keymap-prefix nil))
;; Disable LSP's superfluous, expensive and/or debatably unnecessary features. ;; Disable LSP's superfluous, expensive and/or debatably unnecessary features.
;; Some servers implement these poorly. Better to just rely on Emacs' native ;; Some servers implement these poorly. Better to just rely on Emacs' native
@ -101,9 +103,10 @@ This also logs the resolved project root, if found, so we know where we are."
(lambda (it) (format "[%s]" (lsp--workspace-print it))) (lambda (it) (format "[%s]" (lsp--workspace-print it)))
lsp--buffer-workspaces)))))) lsp--buffer-workspaces))))))
(dolist (leader-key (list doom-leader-key doom-leader-alt-key)) (when (featurep! :config default +bindings)
(let ((lsp-keymap-prefix (concat leader-key " c l"))) (dolist (leader-key (list doom-leader-key doom-leader-alt-key))
(lsp-enable-which-key-integration))) (let ((lsp-keymap-prefix (concat leader-key " c l")))
(lsp-enable-which-key-integration))))
(add-hook! 'lsp-mode-hook (add-hook! 'lsp-mode-hook
(defun +lsp-init-company-h () (defun +lsp-init-company-h ()