refactor repl

Author: sprocketc

src/renderer/core.cljs

@@ -27,7 +27,6 @@
    [renderer.history.subs]
    [renderer.notification.events]
    [renderer.notification.subs]
-   [renderer.reepl.core]
    [renderer.reepl.replumb :as replumb]
    [renderer.ruler.subs]
    [renderer.snap.events]

src/renderer/reepl/codemirror.cljs

@@ -9,6 +9,7 @@
    ["codemirror/mode/clojure/clojure.js"]
    ["codemirror/mode/javascript/javascript.js"]
    ["react" :as react]
+   [cljs.tools.reader :as reader]
    [clojure.string :as str]
    [reagent.core :as r]))
 
@@ -30,6 +31,50 @@
      :end #js {:line lno
                :ch (+ cno (count forward))}}))
 
+(defn is-valid-cljs?
+  [source]
+  (try
+    (fn []
+      (reader/read-string source)
+      true)
+    (catch js/Error _
+      false)))
+
+(def default-opts
+  {:style {:height "auto"
+           :flex 1}
+
+   :should-go-up
+   (fn [_source inst]
+     (let [pos (.getCursor inst)]
+       (= 0 (.-line pos))))
+
+   :should-go-down
+   (fn [_source inst]
+     (let [pos (.getCursor inst)
+           last-line (.lastLine inst)]
+       (= last-line (.-line pos))))
+
+   ;; TODO: if the cursor is inside a list, and the function doesn't have enought
+   ;; arguments yet, then return false
+   ;; e.g. (map |) <- map needs at least one argument.
+   :should-eval
+   (fn [source inst evt]
+     (if (.-shiftKey evt)
+       false
+       (if (.-metaKey evt)
+         true
+         (let [lines (.lineCount inst)
+               in-place (or (= 1 lines)
+                            (let [pos (.getCursor inst)
+                                  last-line (dec lines)]
+                              (and
+                               (= last-line (.-line pos))
+                               (= (.-ch pos)
+                                  (count (.getLine inst last-line))))))]
+           (and in-place
+                (is-valid-cljs? source))))))})
+
 (defn cm-current-word
   "Find the current 'word' according to CodeMirror's `wordChars' list"
   [cm]
@@ -148,21 +193,22 @@
 
   :on-cm-init (fn [cm] -> nil)
     called with the CodeMirror instance, for whatever extra fiddling you want to do."
-  [value-atom {:keys [style
-                      on-change
-                      on-eval
-                      on-up
-                      on-down
-                      complete-atom
-                      complete-word
-                      should-go-up
-                      should-go-down
-                      should-eval
-                      js-cm-opts
-                      on-cm-init]}]
-
+  [value-atom options]
   (let [cm (atom nil)
-        ref (react/createRef)]
+        ref (react/createRef)
+        options (merge default-opts options)
+        {:keys [style
+                on-change
+                on-eval
+                on-up
+                on-down
+                complete-atom
+                complete-word
+                should-go-up
+                should-go-down
+                should-eval
+                js-cm-opts
+                on-cm-init]} options]
     (r/create-class
      {:component-did-mount
       (fn [_this]

src/renderer/reepl/completions.cljs

@@ -0,0 +1,6 @@
+(ns renderer.reepl.db)
+
+(def initial-state
+  {:items []
+   :hist-pos 0
+   :history [""]})

src/renderer/reepl/core.cljs

@@ -62,3 +62,14 @@
                   0
                   (dec pos))]
     (assoc db :hist-pos new-pos)))
+
+;; TODO: is there a macro or something that could do this cleaner?
+(defn make-handlers
+  [state]
+  {:add-input (partial swap! state add-input)
+   :add-result (partial swap! state add-result)
+   :go-up (partial swap! state go-up)
+   :go-down (partial swap! state go-down)
+   :clear-items (partial swap! state clear-items)
+   :set-text (partial swap! state set-text)
+   :add-log (partial swap! state add-log)})