Merge branch 'master' of github.com:Kodowa/LightTable-Clojure

Author: ibdknox

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changes
 
+##unreleased
+
+* UPDATE: ClojureScript 2202
+
 ##0.0.10
 
 * FIX: disconnecting from a remote nrepl caused issues

codemirror/clojure-mode.js

@@ -47,6 +47,7 @@ CodeMirror.defineMode("clojure", function () {
     keyword_char: /[^\s\(\[\;\)\]]/,
     basic: /[\w\$_\-\.\*\+\/\?\><!]/,
     lang_keyword: /[\w\*\+!\-_?:\/\.#=><]/,
+    block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
   };
 
   function stateStack(indent, type, prev) { // represents a state stack object
@@ -117,7 +118,7 @@ CodeMirror.defineMode("clojure", function () {
       state.mode = "comment";
       pushStack(state, indentTemp + INDENT_WORD_SKIP, "comment");
     } else if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                               /^(?:def|with)/.test(keyWord))) { // indent-word
+                               tests.block_indent.test(keyWord))) { // indent-word
       pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
     } else { // non-indent word
       // we continue eating the spaces

lein-light-nrepl/project.clj

@@ -11,7 +11,7 @@
                  [ibdknox/analyzer "0.0.2"]
                  [clj-stacktrace "0.2.7"]
                  [fs "1.3.3"]
-                 [org.clojure/clojurescript "0.0-2173"
+                 [org.clojure/clojurescript "0.0-2202"
                    :exclusions [org.apache.ant/ant]]
                  [com.cemerick/pomegranate "0.2.0"]
                  [clojure-complete "0.2.3"]

lein-light-nrepl/src/lighttable/nrepl/cljs.clj

@@ -12,7 +12,6 @@
             [cljs.source-map :as sm]
             [cljs.env :as cljs-env :refer [with-compiler-env]]
             [clojure.test :as test]
-            [cljs.closure :as cljsc]
             [clojure.java.io :as io]
             [cljs.tagged-literals :as tags]
             [clojure.set :as set :refer [difference union intersection]]
@@ -24,7 +23,16 @@
             [ibdknox.tools.reader.reader-types :as rt])
   (:import java.io.Writer))
 
-
+(def js-dependency-index
+  "Try to get the js-dependency-index function from two places for
+  compatibility with older cljs. This should be removed after support for
+  cljs prior to 0.0-2197 is no longer desired"
+  (->>
+    (for [x ['cljs.closure/js-dependency-index
+             'cljs.js-deps/js-dependency-index]]
+      (some->> x resolve deref))
+    (filter identity)
+    (first)))
 
 (defn without
   "Returns set s with x removed."
@@ -185,7 +193,7 @@
     {(-> dep :name) dep}))
 
 (defn js-dep [{:keys [ns]}]
-  (when-let [dep (get (cljsc/js-dependency-index {}) (str ns))]
+  (when-let [dep (get (js-dependency-index {}) (str ns))]
     (let [deps (:requires dep)
           deps (if (not= ns 'goog)
                  (conj deps 'goog)

src/lt/plugins/clojure.cljs

@@ -450,10 +450,10 @@
           :reaction (fn [this res len]
                       len))
 
-(object/object* :langs.clj
+(object/object* ::langs.clj
                 :tags #{:clojure.lang})
 
-(def clj-lang (object/create :langs.clj))
+(def clj-lang (object/create ::langs.clj))
 
 (behavior ::java-exe
           :triggers #{:object.instant}