Merge pull request #1719 from galagora/hoogle-improvements

Make Hoogle work in Nix shell

Author: purcell

haskell-commands.el

@@ -192,29 +192,6 @@ MODULE-BUFFER is the actual Emacs buffer of the module being loaded."
 (defvar haskell-cabal-targets-history nil
   "History list for session targets.")
 
-(defun haskell-process-hayoo-ident (ident)
-  "Hayoo for IDENT, return a list of modules"
-  ;; We need a real/simulated closure, because otherwise these
-  ;; variables will be unbound when the url-retrieve callback is
-  ;; called.
-  ;; TODO: Remove when this code is converted to lexical bindings by
-  ;; default (Emacs 24.1+)
-  (let ((url (format haskell-process-hayoo-query-url (url-hexify-string ident))))
-    (with-current-buffer (url-retrieve-synchronously url)
-      (if (= 200 url-http-response-status)
-          (progn
-            (goto-char url-http-end-of-headers)
-            (let* ((res (json-read))
-                   (results (assoc-default 'result res)))
-              ;; TODO: gather packages as well, and when we choose a
-              ;; given import, check that we have the package in the
-              ;; cabal file as well.
-              (cl-mapcan (lambda (r)
-                           ;; append converts from vector -> list
-                           (append (assoc-default 'resultModules r) nil))
-                         results)))
-        (warn "HTTP error %s fetching %s" url-http-response-status url)))))
-
 (defun haskell-process-hoogle-ident (ident)
   "Hoogle for IDENT, return a list of modules."
   (with-temp-buffer

haskell-customize.el

@@ -214,18 +214,6 @@ Flycheck users might like to disable this."
   :type 'boolean
   :group 'haskell-interactive)
 
-(defcustom haskell-process-suggest-hayoo-imports
-  nil
-  "Suggest to add import statements using Hayoo as a backend."
-  :type 'boolean
-  :group 'haskell-interactive)
-
-(defcustom haskell-process-hayoo-query-url
-  "http://hayoo.fh-wedel.de/json/?query=%s"
-  "Query url for json hayoo results."
-  :type 'string
-  :group 'haskell-interactive)
-
 (defcustom haskell-process-suggest-haskell-docs-imports
   nil
   "Suggest to add import statements using haskell-docs as a backend."

haskell-hoogle.el

@@ -1,4 +1,4 @@
-;;; haskell-hoogle.el --- Look up Haskell documentation via hoogle or hayoo  -*- lexical-binding: t; -*-
+;;; haskell-hoogle.el --- Look up Haskell documentation via hoogle -*- lexical-binding: t; -*-
 
 ;; Copyright © 2015 Steve Purcell
 ;;             2016 Arthur Fayzrakhmanov
@@ -21,7 +21,7 @@
 
 ;;; Commentary:
 
-;; Functions for looking up documentation with hayoo or hoogle, via
+;; Functions for looking up documentation with hoogle, via
 ;; either local or remote servers.
 
 ;;; Code:
@@ -30,24 +30,49 @@
 (require 'haskell-mode)
 (require 'haskell-utils)
 
+(defun hoogle-prompt ()
+  "Prompt for Hoogle query."
+  (let ((def (haskell-ident-at-point)))
+    (if (and def (symbolp def)) (setq def (symbol-name def)))
+    (list (read-string (if def
+                           (format "Hoogle query (default %s): " def)
+                         "Hoogle query: ")
+                       nil nil def)
+          )))
 
-(defcustom haskell-hoogle-command
-  (if (executable-find "hoogle") "hoogle")
-  "Name of the command to use to query Hoogle.
-If nil, use the Hoogle web-site."
-  :group 'haskell
-  :type '(choice (const :tag "Use Web-site" nil)
-                 string))
+;;;###autoload
+(defun haskell-hoogle (query &optional info)
+  "Do a Hoogle search for QUERY.
+
+If prefix argument INFO is given, then `haskell-hoogle-command'
+is asked to show extra info for the items matching QUERY.."
+  (interactive (append (hoogle-prompt) current-prefix-arg))
+  (let* ((command (concat (executable-find "hoogle")
+                          (if info " -i " "")
+                          " --color " (shell-quote-argument query)))
+         (output (shell-command-to-string command)))
+    (with-help-window "*hoogle*"
+      (with-current-buffer standard-output
+        (insert output)
+        (ansi-color-apply-on-region (point-min) (point-max))))))
+
+;;;###autoload
+(defalias 'hoogle 'haskell-hoogle)
 
 (defcustom haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s"
   "Default value for hoogle web site."
   :group 'haskell
   :type '(choice
           (const :tag "haskell-org" "https://hoogle.haskell.org/?hoogle=%s")
           (const :tag "fp-complete" "https://www.stackage.org/lts/hoogle?q=%s")
-          (const :tag "hayoo" "http://hayoo.fh-wedel.de/?query=%s")
           string))
 
+;;;###autoload
+(defun haskell-hoogle-lookup-from-website (query)
+  "Lookup QUERY at `haskell-hoogle-url'."
+  (interactive (hoogle-prompt))
+  (browse-url (format haskell-hoogle-url (url-hexify-string query))))
+
 (defcustom haskell-hoogle-server-command (lambda (port)
                                            (list "hoogle" "server"
                                             "--local"
@@ -58,35 +83,6 @@ If nil, use the Hoogle web-site."
   :type 'function
   )
 
-;;;###autoload
-(defun haskell-hoogle (query &optional info)
-  "Do a Hoogle search for QUERY.
-When `haskell-hoogle-command' is non-nil, this command runs
-that.  Otherwise, it opens a hoogle search result in the browser.
-
-If prefix argument INFO is given, then `haskell-hoogle-command'
-is asked to show extra info for the items matching QUERY.."
-  (interactive
-   (let ((def (haskell-ident-at-point)))
-     (if (and def (symbolp def)) (setq def (symbol-name def)))
-     (list (read-string (if def
-                            (format "Hoogle query (default %s): " def)
-                          "Hoogle query: ")
-                        nil nil def)
-           current-prefix-arg)))
-  (if (null haskell-hoogle-command)
-      (browse-url (format haskell-hoogle-url (url-hexify-string query)))
-    (let ((command (concat haskell-hoogle-command
-                           (if info " -i " "")
-                           " --color " (shell-quote-argument query))))
-      (with-help-window "*hoogle*"
-        (with-current-buffer standard-output
-          (insert (shell-command-to-string command))
-          (ansi-color-apply-on-region (point-min) (point-max)))))))
-
-;;;###autoload
-(defalias 'hoogle 'haskell-hoogle)
-
 (defvar haskell-hoogle-server-process-name "emacs-local-hoogle")
 (defvar haskell-hoogle-server-buffer-name (format "*%s*" haskell-hoogle-server-process-name))
 (defvar haskell-hoogle-port-number 49513 "Port number.")
@@ -119,43 +115,17 @@ is asked to show extra info for the items matching QUERY.."
 
 ;;;###autoload
 (defun haskell-hoogle-lookup-from-local ()
-  "Lookup by local hoogle."
+  "Lookup QUERY on local hoogle server."
   (interactive)
   (if (haskell-hoogle-server-live-p)
       (browse-url (format "http://localhost:%i/?hoogle=%s"
                           haskell-hoogle-port-number
-                          (read-string "hoogle: " (haskell-ident-at-point))))
+                          (car (hoogle-prompt))))
     (haskell-mode-toggle-interactive-prompt-state)
     (unwind-protect
         (when (y-or-n-p "Hoogle server not running, start hoogle server? ")
           (haskell-hoogle-start-server))
       (haskell-mode-toggle-interactive-prompt-state t))))
 
-
-(defcustom haskell-hayoo-url "http://hayoo.fh-wedel.de/?query=%s"
-  "Default value for hayoo web site."
-  :group 'haskell
-  :type '(choice
-          (const :tag "fh-wedel.de" "http://hayoo.fh-wedel.de/?query=%s")
-          string))
-
-;;;###autoload
-(defun haskell-hayoo (query)
-  "Do a Hayoo search for QUERY."
-  (interactive
-   (let ((def (haskell-ident-at-point)))
-     (if (and def (symbolp def)) (setq def (symbol-name def)))
-     (list (read-string (if def
-                            (format "Hayoo query (default %s): " def)
-                          "Hayoo query: ")
-                        nil nil def))))
-  (browse-url (format haskell-hayoo-url (url-hexify-string query))))
-
-;;;###autoload
-(defalias 'hayoo 'haskell-hayoo)
-
-
-
-
 (provide 'haskell-hoogle)
 ;;; haskell-hoogle.el ends here

haskell-load.el

@@ -246,9 +246,6 @@ list of modules where missed IDENT was found."
                (haskell-process-suggest-imports session file modules ident)))
            (when haskell-process-suggest-haskell-docs-imports
              (let ((modules (haskell-process-haskell-docs-ident ident)))
-               (haskell-process-suggest-imports session file modules ident)))
-           (when haskell-process-suggest-hayoo-imports
-             (let ((modules (haskell-process-hayoo-ident ident)))
                (haskell-process-suggest-imports session file modules ident)))))
         ((string-match "^[ ]+It is a member of the hidden package [‘`‛]\\([^@\r\n]+\\).*['’].$" msg)
          (when haskell-process-suggest-add-package