Merge pull request #3094 from sei40kr/add-lookup-handlers

tools/lookup: Support lookup handlers for implementations and type definition

modules/tools/lookup/autoload/lookup.el

@@ -15,6 +15,12 @@ properties:
 
 :definition FN
   Run when jumping to a symbol's definition. Used by `+lookup/definition'.
+:implementations FN
+  Run when looking for implementations of a symbol in the current project. Used
+  by `+lookup/implementations'.
+:type-definition FN
+  Run when jumping to a symbol's type definition. Used by
+  `+lookup/type-definition'.
 :references FN
   Run when looking for usage references of a symbol in the current project. Used
   by `+lookup/references'.
@@ -46,6 +52,7 @@ change the current buffer or window or return non-nil when it succeeds.
 
 If it doesn't change the current buffer, or it returns nil, the lookup module
 will fall back to the next handler in `+lookup-definition-functions',
+`+lookup-implementations-functions', `+lookup-type-definition-functions',
 `+lookup-references-functions', `+lookup-file-functions' or
 `+lookup-documentation-functions'.
 
@@ -57,7 +64,7 @@ This can be passed nil as its second argument to unset handlers for MODES. e.g.
 
   (set-lookup-handlers! 'python-mode nil)
 
-\(fn MODES &key DEFINITION REFERENCES DOCUMENTATION FILE XREF-BACKEND ASYNC)"
+\(fn MODES &key DEFINITION IMPLEMENTATIONS TYPE-DEFINITION REFERENCES DOCUMENTATION FILE XREF-BACKEND ASYNC)"
   (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((hook (intern (format "%s-hook" mode)))
@@ -69,15 +76,19 @@ This can be passed nil as its second argument to unset handlers for MODES. e.g.
         (fset
          fn
          (lambda ()
-           (cl-destructuring-bind (&key definition references documentation file xref-backend async)
+           (cl-destructuring-bind (&key definition implementations type-definition references documentation file xref-backend async)
                plist
              (cl-mapc #'+lookup--set-handler
                       (list definition
+                            implementations
+                            type-definition
                             references
                             documentation
                             file
                             xref-backend)
                       (list '+lookup-definition-functions
+                            '+lookup-implementations-functions
+                            '+lookup-type-definition-functions
                             '+lookup-references-functions
                             '+lookup-documentation-functions
                             '+lookup-file-functions
@@ -133,6 +144,8 @@ This can be passed nil as its second argument to unset handlers for MODES. e.g.
   (let* ((origin (point-marker))
          (handlers
           (plist-get (list :definition '+lookup-definition-functions
+                           :implementations '+lookup-implementations-functions
+                           :type-definition '+lookup-type-definition-functions
                            :references '+lookup-references-functions
                            :documentation '+lookup-documentation-functions
                            :file '+lookup-file-functions)
@@ -241,6 +254,30 @@ evil-mode is active."
         ((+lookup--jump-to :definition identifier nil arg))
         ((error "Couldn't find the definition of %S" identifier))))
 
+;;;###autoload
+(defun +lookup/implementations (identifier &optional arg)
+  "Jump to the implementations of IDENTIFIER (defaults to the symbol at point).
+
+Each function in `+lookup-implementations-functions' is tried until one changes
+the point or current buffer."
+  (interactive (list (doom-thing-at-point-or-region)
+                     current-prefix-arg))
+  (cond ((null identifier) (user-error "Nothing under point"))
+        ((+lookup--jump-to :implementations identifier nil arg))
+        ((error "Couldn't find the implementations of %S" identifier))))
+
+;;;###autoload
+(defun +lookup/type-definition (identifier &optional arg)
+  "Jump to the type definition of IDENTIFIER (defaults to the symbol at point).
+
+Each function in `+lookup-type-definition-functions' is tried until one changes
+the point or current buffer."
+  (interactive (list (doom-thing-at-point-or-region)
+                     current-prefix-arg))
+  (cond ((null identifier) (user-error "Nothing under point"))
+        ((+lookup--jump-to :type-definition identifier nil arg))
+        ((error "Couldn't find the definition of %S" identifier))))
+
 ;;;###autoload
 (defun +lookup/references (identifier &optional arg)
   "Show a list of usages of IDENTIFIER (defaults to the symbol at point)

modules/tools/lookup/config.el

@@ -3,6 +3,8 @@
 ;; "What am I looking at?" This module helps you answer this question.
 ;;
 ;;   + `+lookup/definition': a jump-to-definition that should 'just work'
+;;   + `+lookup/implementations': find a symbol's implementations in the current
+;;                                project
 ;;   + `+lookup/references': find a symbol's references in the current project
 ;;   + `+lookup/file': open the file referenced at point
 ;;   + `+lookup/online'; look up a symbol on online resources
@@ -52,6 +54,24 @@ If the argument is interactive (satisfies `commandp'), it is called with
 argument: the identifier at point. See `set-lookup-handlers!' about adding to
 this list.")
 
+(defvar +lookup-implementations-functions ()
+  "Function for `+lookup/implementations' to try. Stops at the first function to
+return non-nil or change the current window/point.
+
+If the argument is interactive (satisfies `commandp'), it is called with
+`call-interactively' (with no arguments). Otherwise, it is called with one
+argument: the identifier at point. See `set-lookup-handlers!' about adding to
+this list.")
+
+(defvar +lookup-type-definition-functions ()
+  "Functions for `+lookup/type-definition' to try. Stops at the first function to
+return non-nil or change the current window/point.
+
+If the argument is interactive (satisfies `commandp'), it is called with
+`call-interactively' (with no arguments). Otherwise, it is called with one
+argument: the identifier at point. See `set-lookup-handlers!' about adding to
+this list.")
+
 (defvar +lookup-references-functions
   '(+lookup-xref-references-backend-fn
     +lookup-project-search-backend-fn)

modules/tools/lsp/config.el

@@ -54,6 +54,8 @@ working on that project after closing the last buffer.")
   (set-lookup-handlers! 'lsp-mode :async t
     :documentation #'lsp-describe-thing-at-point
     :definition #'lsp-find-definition
+    :implementations #'lsp-find-implementation
+    :type-definition #'lsp-find-type-definition
     :references #'lsp-find-references)
 
   ;; TODO Lazy load these. They don't need to be loaded all at once unless the
@@ -193,6 +195,7 @@ auto-killed (which is a potentially expensive process)."
   (when (featurep! +peek)
     (set-lookup-handlers! 'lsp-ui-mode :async t
       :definition 'lsp-ui-peek-find-definitions
+      :implementations 'lsp-ui-peek-find-implementation
       :references 'lsp-ui-peek-find-references)))