Always check .cljs before .cljc

Author: swannodette

src/clj/cljs/analyzer.clj

@@ -110,8 +110,8 @@
 (defmethod error-message :undeclared-ns
   [warning-type {:keys [ns-sym] :as info}]
   (str "No such namespace: " ns-sym
-       ", could not locate " (util/ns->relpath ns-sym :cljc)
-       " or " (util/ns->relpath ns-sym :cljs)))
+       ", could not locate " (util/ns->relpath ns-sym :cljs)
+       " or " (util/ns->relpath ns-sym :cljc)))
 
 (defmethod error-message :dynamic
   [warning-type info]
@@ -1212,18 +1212,18 @@
 (declare analyze-file)
 
 (defn locate-src
-  "Given a namespace return the corresponding ClojureScript (.cljc or .cljs)
+  "Given a namespace return the corresponding ClojureScript (.cljs or .cljc)
   resource on the classpath or file from the root of the build."
   [ns]
   (or (util/ns->source ns)
       (let [rootp (when-let [root (:root @env/*compiler*)]
                     (.getPath ^File root))
-            cljcf (io/file rootp (util/ns->relpath ns :cljc))
-            cljsf (io/file rootp (util/ns->relpath ns :cljs))]
-        (if (and (.exists cljcf) (.isFile cljcf))
-          cljcf
-          (if (and (.exists cljsf) (.isFile cljsf))
-            cljsf)))))
+            cljsf (io/file rootp (util/ns->relpath ns :cljs))
+            cljcf (io/file rootp (util/ns->relpath ns :cljc))]
+        (if (and (.exists cljsf) (.isFile cljsf))
+          cljsf
+          (if (and (.exists cljcf) (.isFile cljcf))
+            cljcf)))))
 
 (defn foreign-dep? [dep]
   {:pre [(symbol? dep)]}

src/clj/cljs/closure.clj

@@ -479,30 +479,30 @@
     (-compile uri (merge opts {:output-file js-file}))))
 
 (defn cljs-source-for-namespace
-  "Given a namespace return the corresponding source with either a .cljc or
-  .cljs extension."
+  "Given a namespace return the corresponding source with either a .cljs or
+  .cljc extension."
   [ns]
   (let [path (-> (munge ns) (string/replace \. \/))
-        relpath (str path ".cljc")]
+        relpath (str path ".cljs")]
     (if-let [res (io/resource relpath)]
       {:relative-path relpath :uri res}
-      (let [relpath (str path ".cljs")]
+      (let [relpath (str path ".cljc")]
         (if-let [res (io/resource relpath)]
           {:relative-path relpath :uri res})))))
 
 (defn source-for-namespace
   "Given a namespace and compilation environment return the relative path and
   uri of the corresponding source regardless of the source language extension:
-  .cljc, .cljs, .js"
+  .cljs, .cljc, .js"
   [ns compiler-env]
   (let [ns-str  (str (comp/munge ns {}))
         path    (string/replace ns-str \. \/)
-        relpath (str path ".cljc")]
-    (if-let [cljc-res (io/resource relpath)]
-      {:relative-path relpath :uri cljc-res}
-      (let [relpath (str path ".cljs")]
-        (if-let [cljs-res (io/resource relpath)]
-          {:relative-path relpath :uri cljs-res}
+        relpath (str path ".cljs")]
+    (if-let [cljs-res (io/resource relpath)]
+      {:relative-path relpath :uri cljs-res}
+      (let [relpath (str path ".cljc")]
+        (if-let [cljc-res (io/resource relpath)]
+          {:relative-path relpath :uri cljc-res}
           (let [relpath (:file (get-in @compiler-env [:js-dependency-index ns-str]))]
             (if-let [js-res (and relpath (io/resource relpath))]
               {:relative-path relpath :uri js-res}
@@ -1606,7 +1606,7 @@
   ([src {:keys [wrap all-provides] :as options}]
     (let [goog-ns
           (case (util/ext src)
-            ("cljc" "cljs") (comp/munge (:ns (ana/parse-ns src)))
+            ("cljs" "cljc") (comp/munge (:ns (ana/parse-ns src)))
             "js" (cond-> (:provides (parse-js-ns src))
                    (not all-provides) first)
             (throw

src/clj/cljs/compiler.clj

@@ -940,12 +940,12 @@
   String. Always returns a String."
   [^String file-str]
   (cond
-    (.endsWith file-str ".cljc")
-    (clojure.string/replace file-str #"\.cljc$" ".js")
-
     (.endsWith file-str ".cljs")
     (clojure.string/replace file-str #"\.cljs$" ".js")
 
+    (.endsWith file-str ".cljc")
+    (clojure.string/replace file-str #"\.cljc$" ".js")
+
     :else
     (throw (IllegalArgumentException.
              (str "Invalid source file extension " file-str)))))
@@ -1136,12 +1136,12 @@
           (throw (java.io.FileNotFoundException. (str "The file " src " does not exist."))))))))
 
 (defn cljs-files-in
-  "Return a sequence of all .cljc and .cljs files in the given directory."
+  "Return a sequence of all .cljs and .cljc files in the given directory."
   [dir]
   (filter
     #(let [name (.getName ^File %)]
-      (and (or (.endsWith name ".cljc")
-               (.endsWith name ".cljs"))
+      (and (or (.endsWith name ".cljs")
+               (.endsWith name ".cljc"))
            (not= \. (first name))
            (not (contains? cljs-reserved-file-names name))))
     (file-seq dir)))

src/clj/cljs/repl.clj

@@ -202,17 +202,17 @@
 
 (defn ^File js-src->cljs-src
   "Map a JavaScript output file back to the original ClojureScript source
-   file (.cljc or .cljs)."
+   file (.cljs or .cljc)."
   [f]
   (let [f (io/file f)
         dir (.getParentFile f)
         base-name (string/replace (.getName f) ".js" "")
-        cljcf (io/file dir (str base-name ".cljc"))]
-    (if (.exists cljcf)
-      cljcf
-      (let [cljsf (io/file dir (str base-name ".cljs"))]
-        (if (.exists cljsf)
-          cljsf)))))
+        cljsf (io/file dir (str base-name ".cljs"))]
+    (if (.exists cljsf)
+      cljsf
+      (let [cljcf (io/file dir (str base-name ".cljc"))]
+        (if (.exists cljcf)
+          cljcf)))))
 
 (defn read-source-map
   "Return the source map for the JavaScript source file."

src/clj/cljs/repl/browser.clj

@@ -90,8 +90,8 @@
             ".html" "text/html"
             ".jpg" "image/jpeg"
             ".js" "text/javascript"
-            ".cljc" "text/x-clojure"
             ".cljs" "text/x-clojure"
+            ".cljc" "text/x-clojure"
             ".map" "application/json"
             ".png" "image/png"
             "text/plain"))

src/clj/cljs/util.clj

@@ -58,8 +58,8 @@
 (defn ns->source
   "Given a namespace as a symbol return the corresponding resource if it exists."
   [ns]
-  (or (io/resource (ns->relpath ns :cljc))
-      (io/resource (ns->relpath ns :cljs))))
+  (or (io/resource (ns->relpath ns :cljs))
+      (io/resource (ns->relpath ns :cljc))))
 
 (defn path-seq
   [file-str]