Merge pull request #98 from mauricioszabo/fix-repl-for-pathom

Fix CLJS REPL for pathom

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.5.5
 - Fixed nREPL code disconnecting when you send accents
 - Fixed some undetectable var definitions
+- Fixed ClojureScript REPL detection on `.cljs` when `:prefer-cljs` option is selected
 
 ## 0.5.3
 - Bugfixes on some edge cases

src/repl_tooling/commands_to_repl/pathom.cljs

@@ -62,7 +62,7 @@
    ::connect/output [{:repl/namespaces [:repl/namespace]}]}
 
   (p/let [f (-> ast :params :filter)
-          {:keys [result]} (eval/eval clj "(mapv ns-name (all-ns))")]
+          {:keys [result]} (eval/eval clj "(clojure.core/mapv clojure.core/ns-name (clojure.core/all-ns))")]
     {:repl/namespaces (cond->> (map (fn [n] {:repl/namespace n}) result)
                                f (filter (fn [n]
                                            (-> n :repl/namespace str
@@ -92,7 +92,7 @@
         :else {:cljs/required? false})
 
       (-> config :eval-mode (= :prefer-cljs))
-      {:cljs/required? cljc-file?})))
+      {:cljs/required? (or cljs-file? cljc-file?)})))
 
 (connect/defresolver repls-for-evaluation
   [{:keys [editor-state ast]} {:keys [:cljs/required?]}]
@@ -114,7 +114,7 @@
   {::connect/input #{:repl/namespace :repl/aux}
    ::connect/output [{:namespace/vars [:var/fqn]}]}
 
-  (p/let [{:keys [result]} (eval/eval aux (str "(ns-interns '" namespace ")"))]
+  (p/let [{:keys [result]} (eval/eval aux (str "(clojure.core/ns-interns '" namespace ")"))]
     {:namespace/vars (map (fn [v] {:var/fqn (symbol namespace v)})
                           (keys result))}))
 
@@ -150,10 +150,10 @@
 
   (p/let [keys (-> ast :params :keys)
           res (-> aux
-                  (eval/eval (str "(meta #'" fqn ")"))
+                  (eval/eval (str "(clojure.core/meta #'" fqn ")"))
                   (p/catch (constantly nil)))
           res (if (and required? (-> res :result nil?))
-                (eval/eval clj (str "(meta #'" fqn ")"))
+                (eval/eval clj (str "(clojure.core/meta #'" fqn ")"))
                 res)]
     {:var/meta (cond-> (:result res)
                        (coll? keys) (select-keys keys))}))
@@ -170,7 +170,7 @@
                 "                   fun #(clojure.core/some->> (% s) clojure.spec.alpha/describe)]"
                 " (clojure.core/when s"
                 "   (clojure.core/->> [:args :ret :fn]"
-                "      (clojure.core/map (juxt identity fun))"
+                "      (clojure.core/map (clojure.core/juxt clojure.core/identity fun))"
                 "      (clojure.core/filter clojure.core/second)"
                 "      (clojure.core/into {}))))"))]
     (when result {:var/spec result})))

test/repl_tooling/editor_integration/pathom_test.cljs

@@ -78,6 +78,12 @@
 
       (swap! config assoc :eval-mode :prefer-clj)
       (swap! fake/state assoc :filename "somefile.cljs")
+      (check (pathom/eql {:editor-state (:editor-state @fake/state)}
+                         [:repl/eval :repl/aux :repl/clj])
+             => cljs-repls)
+
+      (swap! config assoc :eval-mode :prefer-cljs)
+      (swap! fake/state assoc :filename "somefile.cljs")
       (check (pathom/eql {:editor-state (:editor-state @fake/state)}
                          [:repl/eval :repl/aux :repl/clj])
              => cljs-repls))