From a57c0fbede5175921788a139ad0498593bfe2bc7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 28 Aug 2018 20:48:49 +0200 Subject: [PATCH] feature/lookup: remove devdocs support (for now) devdocs-lookup is broken at the moment. devdocs search is still available through +lookup/online as a provider however. This may be reversed later, when (and if) we find a better devdocs backend. --- init.example.el | 1 - modules/config/default/+evil-commands.el | 1 - modules/feature/lookup/autoload/devdocs.el | 22 ---------------------- modules/feature/lookup/autoload/evil.el | 6 ------ modules/feature/lookup/autoload/lookup.el | 9 +-------- modules/feature/lookup/config.el | 21 +-------------------- modules/feature/lookup/packages.el | 3 --- 7 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 modules/feature/lookup/autoload/devdocs.el diff --git a/init.example.el b/init.example.el index 58a5e0fb2..87b2429d7 100644 --- a/init.example.el +++ b/init.example.el @@ -7,7 +7,6 @@ (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files (lookup ; helps you navigate your code and documentation - +devdocs ; ...on devdocs.io online +docsets) ; ...or in Dash docsets locally snippets ; my elves. They type so I don't have to spellcheck ; tasing you for misspelling mispelling diff --git a/modules/config/default/+evil-commands.el b/modules/config/default/+evil-commands.el index 657524b18..0683cdbae 100644 --- a/modules/config/default/+evil-commands.el +++ b/modules/config/default/+evil-commands.el @@ -59,7 +59,6 @@ command from the current directory instead of the project root." ;; TODO (ex! "go[ogle]" #'doom:google-search) (ex! "lo[okup]" #'+lookup:online) (ex! "dash" #'+lookup:dash) -(ex! "dd" #'+lookup:devdocs) (ex! "http" #'httpd-start) ; start http server (ex! "repl" #'+eval:repl) ; invoke or send to repl ;; TODO (ex! "rx" 'doom:regex) ; open re-builder diff --git a/modules/feature/lookup/autoload/devdocs.el b/modules/feature/lookup/autoload/devdocs.el deleted file mode 100644 index 5625c81e9..000000000 --- a/modules/feature/lookup/autoload/devdocs.el +++ /dev/null @@ -1,22 +0,0 @@ -;;; feature/lookup/autoload/devdocs.el -*- lexical-binding: t; -*- -;;;###if (featurep! +devdocs) - -;;;###autodef -(defun set-devdocs! (modes docset) - "Map major MODES (one major-mode symbol or a list of them) to a devdocs -DOCSET (a string). - -See `devdocs-alist' for the defaults. " - (defer-until! (boundp 'devdocs-alist) - (dolist (mode (doom-enlist modes)) - (setf (alist-get mode devdocs-alist) docset)))) - -;; FIXME obsolete :devdocs -;;;###autoload -(def-setting! :devdocs (modes docset) - "Map major MODES (one major-mode symbol or a list of them) to a devdocs -DOCSET (a string). - -See `devdocs-alist' for the defaults. " - :obsolete set-devdocs! - `(set-devdocs! ,modes ,docset)) diff --git a/modules/feature/lookup/autoload/evil.el b/modules/feature/lookup/autoload/evil.el index 72c193fcc..26bafc489 100644 --- a/modules/feature/lookup/autoload/evil.el +++ b/modules/feature/lookup/autoload/evil.el @@ -14,9 +14,3 @@ engine." "TODO" (interactive "") (+lookup/in-docsets query (if bang 'blank))) - -;;;###autoload (autoload '+lookup:devdocs "feature/lookup/autoload/evil" nil t) -(evil-define-command +lookup:devdocs (query &optional bang) - "TODO" - (interactive "") - (+lookup/in-devdocs query (if bang 'blank))) diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el index 9c5ae2201..078165241 100644 --- a/modules/feature/lookup/autoload/lookup.el +++ b/modules/feature/lookup/autoload/lookup.el @@ -198,8 +198,7 @@ Goes down a list of possible backends: 1. The :documentation spec defined with by `set-lookup-handlers!' 2. If the +docsets flag is active for :feature lookup, use `+lookup/in-docsets' -3. If the +devdocs flag is active for :feature lookup, run `+lookup/in-devdocs' -4. Fall back to an online search, with `+lookup/online'" +3. Fall back to an online search, with `+lookup/online'" (interactive (list (+lookup--symbol-or-region))) (cond ((and +lookup-documentation-functions @@ -214,9 +213,6 @@ Goes down a list of possible backends: (helm-dash-installed-docsets)) (+lookup/in-docsets identifier)) - ((featurep! +devdocs) - (call-interactively #'+lookup/in-devdocs)) - ((+lookup/online identifier (+lookup--online-provider (not current-prefix-arg)))))) @@ -272,9 +268,6 @@ Otherwise, falls back on `find-file-at-point'." ;; Source-specific commands ;; -;;;###autoload -(defalias #'+lookup/in-devdocs #'devdocs-lookup) - (defvar counsel-dash-docsets) (defvar helm-dash-docsets) ;;;###autoload diff --git a/modules/feature/lookup/config.el b/modules/feature/lookup/config.el index 5f0431a4b..8ea92aa0f 100644 --- a/modules/feature/lookup/config.el +++ b/modules/feature/lookup/config.el @@ -5,11 +5,7 @@ ;; + `+lookup/definition': a jump-to-definition that should 'just work' ;; + `+lookup/references': find a symbol's references in the current project ;; + `+lookup/online'; look up a symbol on online resources -;; + `+lookup/docs-at-point' -;; + `+lookup/docs-dash' -;; + `+lookup/docs-dash-at-point' -;; + `+lookup/devdocs' -;; + `+lookup/devdocs-at-point' +;; + `+lookup/in-docsets': look up in Dash docsets ;; ;; This module uses `xref', an experimental new library in Emacs. It may change ;; in the future. When xref can't be depended on it will fall back to @@ -140,18 +136,3 @@ argument: the identifier at point.") (featurep! :completion ivy)) :commands counsel-dash-install-docset :config (setq counsel-dash-min-length 2)) - - -;; -;; devdocs.io integration -;; - -(when (featurep! +devdocs) - (after! devdocs-lookup - (unless (assoc "SCSS" devdocs-subjects) - (setq devdocs-subjects - (append '(("SCSS" "scss") - ("GFM" "markdown") - ("Typescript" "typescript")) - devdocs-subjects))))) - diff --git a/modules/feature/lookup/packages.el b/modules/feature/lookup/packages.el index edfc1acad..743c8631a 100644 --- a/modules/feature/lookup/packages.el +++ b/modules/feature/lookup/packages.el @@ -19,6 +19,3 @@ (package! helm-dash)) (when (featurep! :completion ivy) (package! counsel-dash))) - -(when (featurep! +devdocs) - (package! devdocs-lookup :recipe (:fetcher github :repo "skeeto/devdocs-lookup")))