Updating Doom Emacs.

.emacs.d/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
@@ -13,11 +15,12 @@
 ;; `dumb-jump' to find what you want.
 
 (defvar +lookup-provider-url-alist
-  (append '(("Google"            counsel-search helm-google-suggest "https://google.com/search?q=%s")
+  (append '(("Doom Emacs issues" "https://github.com/hlissner/doom-emacs/issues?q=is%%3Aissue+%s")
+            ("Google"            +lookup--online-backend-google "https://google.com/search?q=%s")
             ("Google images"     "https://www.google.com/images?q=%s")
             ("Google maps"       "https://maps.google.com/maps?q=%s")
             ("Project Gutenberg" "http://www.gutenberg.org/ebooks/search/?query=%s")
-            ("DuckDuckGo"        counsel-search "https://duckduckgo.com/?q=%s")
+            ("DuckDuckGo"        +lookup--online-backend-duckduckgo "https://duckduckgo.com/?q=%s")
             ("DevDocs.io"        "https://devdocs.io/#q=%s")
             ("StackOverflow"     "https://stackoverflow.com/search?q=%s")
             ("Github"            "https://github.com/search?ref=simplesearch&q=%s")
@@ -51,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)
@@ -84,6 +105,19 @@ 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-dictionary-prefer-offline (featurep! +offline)
+  "If non-nil, look up dictionaries online.
+
+Setting this to nil will force it to use offline backends, which may be less
+than perfect, but available without an internet connection.
+
+Used by `+lookup/dictionary-definition' and `+lookup/synonyms'.
+
+For `+lookup/dictionary-definition', this is ignored on Mac, where Emacs users
+Dictionary.app behind the scenes to get definitions.")
+
+(defvar +lookup--dash-docs-xwidget-webkit-last-session-buffer nil)
+
 
 ;;
 ;;; dumb-jump
@@ -92,6 +126,7 @@ this list.")
   :commands dumb-jump-result-follow
   :config
   (setq dumb-jump-default-project doom-emacs-dir
+        dumb-jump-prefer-searcher 'rg
         dumb-jump-aggressive nil
         dumb-jump-selector
         (cond ((featurep! :completion ivy)  'ivy)
@@ -124,12 +159,17 @@ this list.")
   (use-package! ivy-xref
     :when (featurep! :completion ivy)
     :config
-    (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)
-    (set-popup-rule! "^\\*xref\\*$" :ignore t))
+    (set-popup-rule! "^\\*xref\\*$" :ignore t)
+    ;; xref initialization is different in Emacs 27 - there are two different
+    ;; variables which can be set rather than just one
+    (when EMACS27+
+      (setq xref-show-definitions-function #'ivy-xref-show-defs))
+    ;; Necessary in Emacs <27. In Emacs 27 it will affect all xref-based
+    ;; commands other than xref-find-definitions too (eg project-find-regexp)
+    (setq xref-show-xrefs-function #'ivy-xref-show-xrefs))
 
   (use-package! helm-xref
-    :when (featurep! :completion helm)
-    :config (setq xref-show-xrefs-function #'helm-xref-show-xrefs)))
+    :when (featurep! :completion helm)))
 
 
 ;;
@@ -141,7 +181,7 @@ this list.")
   :init
   (add-hook '+lookup-documentation-functions #'+lookup-dash-docsets-backend-fn)
   :config
-  (setq dash-docs-enable-debugging doom-debug-mode
+  (setq dash-docs-enable-debugging doom-debug-p
         dash-docs-docsets-path (concat doom-etc-dir "docsets/")
         dash-docs-min-length 2
         dash-docs-browser-func #'eww)
@@ -160,8 +200,44 @@ See https://github.com/magit/ghub/issues/81"
     (let ((gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3"))
       (funcall orig-fn url)))
 
-  (use-package! helm-dash
-    :when (featurep! :completion helm))
+  ;; Dash docset + Xwidget integration
+  (when (featurep! +xwidget)
+    (defun +lookup-dash-docs-xwidget-webkit-browse-url-fn (url &optional new-session)
+      (if (not (display-graphic-p))
+          (eww url new-session)
+        (setq xwidget-webkit-last-session-buffer +lookup--dash-docs-xwidget-webkit-last-session-buffer)
+        (save-window-excursion
+          (xwidget-webkit-browse-url url new-session))
+        (with-popup-rules! '(("^\\*xwidget" :vslot -11 :size 0.35 :select nil))
+          (pop-to-buffer xwidget-webkit-last-session-buffer))
+        (setq +lookup--dash-docs-xwidget-webkit-last-session-buffer xwidget-webkit-last-session-buffer
+              xwidget-webkit-last-session-buffer nil)))
+    (setq dash-docs-browser-func #'+lookup-dash-docs-xwidget-webkit-browse-url-fn))
 
-  (use-package! counsel-dash
-    :when (featurep! :completion ivy)))
+  (cond ((featurep! :completion helm)
+         (require 'helm-dash nil t))
+        ((featurep! :completion ivy)
+         (require 'counsel-dash nil t))))
+
+
+;;
+;;; Dictionary integration
+
+(use-package! define-word
+  :when (featurep! +dictionary)
+  :unless IS-MAC
+  :defer t
+  :config
+  (setq define-word-displayfn-alist
+        (cl-loop for (service . _) in define-word-services
+                 collect (cons service #'+eval-display-results-in-popup))))
+
+
+(when (featurep! +dictionary)
+  (define-key! text-mode-map
+    [remap +lookup/definition] #'+lookup/dictionary-definition
+    [remap +lookup/references] #'+lookup/synonyms))
+
+
+;;;###package synosaurus
+(setq synosaurus-choose-method 'default) ; use ivy/helm instead of ido