Merge pull request #531 from gtrak/master

Allow dicts in value response for clojure-emacs/cider-nrepl#27

Author: bbatsov

cider-client.el

@@ -166,16 +166,24 @@ loaded."
     (buffer-local-value 'nrepl-repl-buffer
                         (get-buffer (nrepl-current-connection-buffer)))))
 
+(defun cider--dict-to-alist (val)
+  "Transforms a nREPL bdecoded dict VAL into an alist.  Simply returns
+it if it's not a dict."
+  (if (and (listp val)
+           (eq (car val) 'dict))
+      (-map '-cons-to-list (cdr val))
+    val))
+
 (defun cider-var-info (var)
-  "Return VAR's info as an alist."
+  "Return VAR's info as an alist with list cdrs."
   (when var
     (let ((val (plist-get (nrepl-send-request-sync
                            (list "op" "info"
                                  "session" (nrepl-current-session)
                                  "ns" (cider-current-ns)
                                  "symbol" var))
                           :value)))
-      (-partition 2 val))))
+      (cider--dict-to-alist val))))
 
 (defun cider-get-var-attr (var attr)
   "Return VAR's ATTR."

test/cider-tests.el

@@ -66,16 +66,17 @@
 (ert-deftest test-cider-var-info ()
   (noflet ((nrepl-send-request-sync (list)
                                     `(:value
-                                      ("arglists" "([] [x] [x & ys])"
-                                       "ns" "clojure.core"
-                                       "name" "str"
-                                       "column" 1
-                                       "added" "1.0"
-                                       "static" "true"
-                                       "doc" "stub"
-                                       "line" 504
-                                       "file" "jar:file:/clojure-1.5.1.jar!/clojure/core.clj"
-                                       "tag" "class java.lang.String")
+                                      (dict
+                                       ("arglists" . "([] [x] [x & ys])")
+                                       ("ns" . "clojure.core")
+                                       ("name" . "str")
+                                       ("column" . 1)
+                                       ("added" . "1.0")
+                                       ("static" . "true")
+                                       ("doc" . "stub")
+                                       ("line" . 504)
+                                       ("file" . "jar:file:/clojure-1.5.1.jar!/clojure/core.clj")
+                                       ("tag" . "class java.lang.String"))
                                       :done t))
            (nrepl-current-session () nil)
            (cider-current-ns () "user"))