From 2088eb67a9df93260255495af31b36e6b3bb549a Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 25 Mar 2019 10:47:46 +0000 Subject: [PATCH] [lsp] set jump handler per lsp-managed buffer Previously, this would try to add the lsp jump handler to the mode's jump handler list every time lsp started managing a buffer of that mode. Now, we only use the lsp jump handler for buffers managed by lsp. --- layers/+tools/lsp/funcs.el | 6 ++---- layers/+tools/lsp/packages.el | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/layers/+tools/lsp/funcs.el b/layers/+tools/lsp/funcs.el index 082d8cc85..b46babd2d 100644 --- a/layers/+tools/lsp/funcs.el +++ b/layers/+tools/lsp/funcs.el @@ -9,11 +9,9 @@ ;; ;;; License: GPLv3 -(defun spacemacs//setup-lsp-jump-handler (&rest modes) +(defun spacemacs//setup-lsp-jump-handler () "Set jump handler for LSP with the given MODE." - (dolist (m modes) - (add-to-list (intern (format "spacemacs-jump-handlers-%S" m)) - '(lsp-ui-peek-find-definitions :async t)))) + (add-to-list 'spacemacs-jump-handlers '(lsp-ui-peek-find-definitions :async t))) ;; Key bindings diff --git a/layers/+tools/lsp/packages.el b/layers/+tools/lsp/packages.el index a0fc2bc16..0347ba4e7 100644 --- a/layers/+tools/lsp/packages.el +++ b/layers/+tools/lsp/packages.el @@ -28,7 +28,7 @@ (spacemacs/lsp-bind-keys) (add-hook 'lsp-after-open-hook (lambda () "Setup xref jump handler and declare keybinding prefixes" - (spacemacs//setup-lsp-jump-handler major-mode) + (spacemacs//setup-lsp-jump-handler) (spacemacs//lsp-declare-prefixes-for-mode major-mode)))))) (defun lsp/init-lsp-ui ()