Merge pull request #676 from otfrom/handle-grimoire-qmark

Replace ? in grimoire URLs.

Author: bbatsov

cider-interaction.el

@@ -1408,8 +1408,11 @@ under point, prompts for a var."
   (interactive "P")
   (cider-read-symbol-name "Symbol: " 'cider-doc-lookup query))
 
-(defun cider-grimoire-replace-dashes (name)
+(defun cider-grimoire-replace-special (name)
   "Convert the dashes in NAME to a grimoire friendly format."
+  (setq name (if (string-match "\\?\\'" name)
+                 (replace-match "_QMARK" t t name)
+               name))
   (setq name (if (string-match "\\`-" name)
                  (replace-match "DASH_" t t name)
                name))
@@ -1423,7 +1426,7 @@ under point, prompts for a var."
   (let ((clojure-version (concat (substring clojure-version 0 4) "0"))
         (base-url "http://grimoire.arrdem.com/"))
     (if name
-        (concat base-url clojure-version "/" ns "/" (cider-grimoire-replace-dashes name) "/")
+        (concat base-url clojure-version "/" ns "/" (cider-grimoire-replace-special name) "/")
       (concat base-url clojure-version "/" ns "/"))))
 
 (defun cider-grimoire-lookup (symbol)

test/cider-tests.el

@@ -544,10 +544,12 @@
   (should (equal "C:/space test" (cider--url-to-file "file:/C:/space%20test"))))
 
 ;;; grimoire tests
-(ert-deftest cider-grimoire-replace-dashes ()
-  (should (equal (cider-grimoire-replace-dashes "defn-") "defn_DASH"))
-  (should (equal (cider-grimoire-replace-dashes "-map-indexed") "DASH_map_DASH_indexed"))
-  (should (equal (cider-grimoire-replace-dashes "-foo-bar-baz-") "DASH_foo_DASH_bar_DASH_baz_DASH")))
+(ert-deftest cider-grimoire-replace-special ()
+  (should (equal (cider-grimoire-replace-special "isa?") "isa_QMARK"))
+  (should (equal (cider-grimoire-replace-special "really-isa?") "really_DASH_isa_QMARK"))
+  (should (equal (cider-grimoire-replace-special "defn-") "defn_DASH"))
+  (should (equal (cider-grimoire-replace-special "-map-indexed") "DASH_map_DASH_indexed"))
+  (should (equal (cider-grimoire-replace-special "-foo-bar-baz-") "DASH_foo_DASH_bar_DASH_baz_DASH")))
 
 (ert-deftest cider-grimoire-url ()
   (should (equal "http://grimoire.arrdem.com/1.5.0/clojure.core/defn_DASH/"