Keyword constant name must handle dash and underscore correctly

Author: Thomas Heller

src/clj/cljs/analyzer.clj

@@ -197,15 +197,14 @@
   `(binding [*cljs-warning-handlers* ~handlers]
      ~@body))
 
-(def ^:private constant-counter (atom 0))
-
 (defn gen-constant-id [value]
   (let [prefix (cond
                  (keyword? value) "constant$keyword$"
                  :else
                  (throw
-                   (Exception. (str "constant type " (type value) " not supported"))))]
-    (symbol (str prefix (string/replace (munge value) "." "$")))))
+                   (Exception. (str "constant type " (type value) " not supported"))))
+        name (-> value (str) (subs 1) (string/replace "-" "_DASH_") (munge) (string/replace "." "$"))]
+    (symbol (str prefix name))))
 
 (defn- register-constant!
   ([val] (register-constant! nil val))

test/clj/cljs/analyzer_tests.clj

@@ -324,3 +324,8 @@
     ;; actual: (not (= #{file-reloading dev client} #{file-reloading dev client core}))
     (is (= (set (a/ns-dependents 'utils))
            #{'file-reloading 'dev 'client 'core}))))
+
+(deftest test-cljs-1105
+  ;; munge turns - into _, must preserve the dash first
+  (is (not= (a/gen-constant-id :test-kw)
+            (a/gen-constant-id :test_kw))))