From 80f19b76f458c6661aff97c7ae96e05c5eaee60d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 15 Nov 2019 16:47:20 +0100
Subject: Emacs: enable progressively-nicer goto-{def,ref} commands

---
 user/emacs/.emacs.d/init.el | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'user/emacs/.emacs.d')

diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el
index 40ae6de6..4aee1385 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/.emacs.d/init.el
@@ -762,6 +762,10 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
               :info-list-face 'flycheck-error-list-info)))
 
 (use-package lsp-mode
+  :general (:states 'normal :keymaps 'lsp-mode-map
+                    "gd" #'xref-find-definitions
+                    "gr" #'xref-find-references
+                    "C-t" #'xref-pop-marker-stack)
   :ghook ('(typescript-mode-hook
             dockerfile-mode-hook
             yaml-mode-hook
@@ -784,6 +788,10 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 (use-package lsp-ui
   :after lsp-mode
   :ghook ('lsp-mode-hook)
+  :general (:states 'normal :keymaps 'lsp-ui-mode-map
+                    "gd" #'lsp-ui-peek-find-definitions
+                    "gr" #'lsp-ui-peek-find-references
+                    "C-t" #'lsp-ui-peek-jump-backward)
   :config (progn
             (setq-default lsp-ui-doc-mode nil))
   :custom ((lsp-ui-sideline-enable t)
-- 
cgit 1.4.1