Merge branch 'master' into remove-unused-behavior

Conflicts:
	clojure_compiled.js
	clojure_compiled.js.map

Author: cldwalker

README.md

@@ -24,7 +24,19 @@ There are 3 ways to eval ClojureScript, 2 of which use your ClojureScript javasc
   * Release the new version of lein-light-nrepl to [clojars](https://clojars.org/lein-light-nrepl)
 * No process for upgrading `clojure-mode.js` until [this issue](https://github.com/LightTable/Clojure/issues/26) is addressed.
 
-###License
+## ClojureScript Workflows
+
+For ClojureScript projects:
+
+Your project is connected to a browser. Recompile cljs outside of LT with project's cljs compile tool e.g. `lein cljsbuild auto`.
+Most changes can be evaled. However, if adding project dependencies or requires to ns, refresh the browser page after cljs has been compiled.
+
+For LightTable plugins:
+
+Your project is connected to `LightTable UI`. When you save any plugin cljs file, compiled js is generated and saved. Any change
+can be eval-ed.
+
+## License
 
 Copyright (C) 2013 Kodowa Inc.
 

clojure.behaviors

@@ -54,9 +54,13 @@
                       :lt.plugins.clojure/on-eval.custom]
 
   :editor.clj.eval [:lt.plugins.clojure/on-eval.one
-                    :lt.plugins.clojure/on-eval
+                    :lt.plugins.clojure/on-eval.clj
                     :lt.plugins.clojure/eval-location]
 
+  :editor.cljs.eval [:lt.plugins.clojure/on-eval.one
+                     :lt.plugins.clojure/on-eval.cljs
+                     :lt.plugins.clojure/eval-location]
+
   :editor.clj [(:lt.object/add-tag :editor.clj.common)
                (:lt.object/add-tag :editor.clj.eval)
                :lt.plugins.clojure/eval-print
@@ -75,7 +79,7 @@
                :lt.plugins.clojure/print-clj-doc]
 
   :editor.cljs [(:lt.object/add-tag :editor.clj.common)
-                (:lt.object/add-tag :editor.clj.eval)
+                (:lt.object/add-tag :editor.cljs.eval)
                 :lt.plugins.clojure/eval-print
                 :lt.plugins.clojure/eval-print-err
                 :lt.plugins.clojure/exec.cljs!

src/lt/plugins/clojure.cljs

@@ -93,16 +93,24 @@
       (or (clients/by-name local-name)
           (run-local-server (clients/client! :nrepl.client))))))
 
-(behavior ::on-eval
+(behavior ::on-eval.clj
           :triggers #{:eval}
           :reaction (fn [editor]
                       (object/raise clj-lang :eval! {:origin editor
                                                      :info (assoc (@editor :info)
                                                              :print-length (object/raise-reduce editor :clojure.print-length+ nil)
-                                                             :code (watches/watched-range editor nil nil (if (object/has-tag? editor :editor.cljs)
-                                                                                                           cljs-watch
-                                                                                                           clj-watch)))})
-                      ))
+                                                             :code (watches/watched-range editor nil nil clj-watch))})))
+(behavior ::on-eval.cljs
+          :triggers #{:eval}
+          :reaction (fn [editor]
+                      (object/raise clj-lang :eval! {:origin editor
+                                                     :info (assoc (@editor :info)
+                                                             :print-length (object/raise-reduce editor :clojure.print-length+ nil)
+                                                             ;; COMPILED temporarily enabled to turn off goog.provide ns errors
+                                                             :code (str
+                                                                    "(set! js/COMPILED-temp js/COMPILED) (set! js/COMPILED true) "
+                                                                    (watches/watched-range editor nil nil cljs-watch)
+                                                                    "(set! js/COMPILED js/COMPILED-temp)"))})))
 
 (behavior ::on-eval.one
           :triggers #{:eval.one}