[Fix clojure-emacs#103] Prefix forms using lists

These are allowed even though they are unidiomatic.  Still, we should
support them, and rewrite the code so the user doesn't have to
manually spend time adhering to convention.

This used to work, but I introduced a regression when I rewrote the
ns-parser and eliminated the instaparse dependency.

The tests have been updated to guard against this regression happening
again.

Author: expez

src/refactor_nrepl/ns/helpers.clj

@@ -9,13 +9,14 @@
       (symbol? thing)))
 
 (defn prefix-form?
-  "True if the vector is of the form [prefix libspec1 libspec2...]"
-  [v]
-  (and (vector? v)
-       (symbol? (first v))
-       (not-any? keyword? v)
-       (> (count v) 1)
-       (every? libspec? (rest v))))
+  "Does the form represent a libspec using prefix notation
+  like: [prefix libspec1 libspec2 ...] ?"
+  [form]
+  (and (or (list? form) (vector? form))
+       (symbol? (first form))
+       (not-any? keyword? form)
+       (> (count form) 1)
+       (every? libspec? (rest form))))
 
 (defn index-of-component [ns-form type]
   (first (keep-indexed #(when (and (sequential? %2) (= (first %2) type)) %1)

src/refactor_nrepl/ns/ns_parser.clj

@@ -18,18 +18,18 @@
     {:ns (symbol libspec)}))
 
 (defn- expand-prefix-specs
-  "Eliminate prefix vectors."
+  "Eliminate prefix lists."
   [libspecs]
-  (let [add-prefix (fn add-prefix [prefix libspec]
-                     (if (vector? libspec)
+  (let [prepend-prefix (fn add-prefix [prefix libspec]
+                     (if (prefix-form? libspec)
                        (apply vector
                          (str prefix "." (first libspec))
                          (rest libspec))
                        (str prefix "." libspec)))
         normalize-libspec-vector (fn [libspec]
                                    (if (prefix-form? libspec)
                                      (let [prefix (first libspec)]
-                                       (map (partial add-prefix prefix)
+                                       (map (partial prepend-prefix prefix)
                                             (rest libspec)))
                                      [libspec]))]
     (mapcat normalize-libspec-vector libspecs)))

test/resources/ns1.clj

@@ -9,7 +9,7 @@
   (:require
    [clojure.instant :as inst :refer [read-instant-date]]
    [clojure.walk :refer [prewalk postwalk]]
-   [clojure data edn]
+   (clojure data edn)
    [clojure.pprint :refer [get-pretty-writer formatter cl-format]]
    clojure.test.junit
    [clojure.xml])