GitHub Issue #210 - fix bug with invalid splicing reader conditionals for refer-clojure (#215)

Author: oakmac

lib/standard-clojure-style.js

@@ -2795,35 +2795,33 @@
       s = strConcat(s, '))')
       return s
 
-    // all symbols are for specific platforms, ie: every symbol is wrapped in a reader conditional
+    // all symbols are for specific platforms across multiple platforms:
+    // wrap a separate (:refer-clojure) per platform inside #?(...)
+    // (We cannot use :exclude #?@(...) here because #?@ splicing outside a
+    // collection produces invalid Clojure.)
     } else if (numPlatforms > 1 && numSymbolsForAllPlatforms === 0) {
       let s = '\n'
       s = printCommentsAbove(s, ns.referClojureCommentsAbove, '  ')
-      s = strConcat(s, '  (:refer-clojure\n')
-      s = strConcat3(s, '    ', kwd)
-      s = strConcat(s, ' #?@(')
+      s = strConcat(s, '  #?(')
 
       let platformIdx = 0
       while (platformIdx < numPlatforms) {
         const platform = platforms[platformIdx]
         const symbolsForPlatform = arrayPluck(filterOnPlatform(symbolsArr, platform), 'symbol')
 
-        s = strConcat(s, formatKeywordFollowedByListOfSymbols(platform, symbolsForPlatform))
-
-        if (inc(platformIdx) !== numPlatforms) {
-          if (kwd === ':exclude') {
-            s = strConcat3(s, '\n', repeatString(' ', 17))
-          } else if (kwd === ':only') {
-            s = strConcat3(s, '\n', repeatString(' ', 14))
-          } else {
-            // FIXME: throw error here?
-          }
+        if (platformIdx === 0) {
+          s = strConcat3(s, platform, ' (:refer-clojure ')
+        } else {
+          s = strConcat(s, '\n     ')
+          s = strConcat3(s, platform, ' (:refer-clojure ')
         }
+        s = strConcat(s, formatKeywordFollowedByListOfSymbols(kwd, symbolsForPlatform))
+        s = strConcat(s, ')')
 
         platformIdx = inc(platformIdx)
       }
 
-      s = strConcat(s, '))')
+      s = strConcat(s, ')')
 
       return s
 

test_format/ns.eno

@@ -994,8 +994,6 @@
 
 # refer-clojure with reader conditionals 4
 
-> FIXME: need to double-check this reader conditional syntax
-
 --Input
 (ns com.example.my-app
   (:refer-clojure :only [#?@(:cljs [dissoc conj]
@@ -1004,15 +1002,12 @@
 
 --Expected
 (ns com.example.my-app
-  (:refer-clojure
-    :only #?@(:clj [frequencies int partition]
-              :cljs [conj dissoc])))
+  #?(:clj (:refer-clojure :only [frequencies int partition])
+     :cljs (:refer-clojure :only [conj dissoc])))
 --Expected
 
 # refer-clojure with reader conditionals 5
 
-> FIXME: need to double-check this reader conditional syntax
-
 --Input
 (ns com.example.my-app
   (:refer-clojure :exclude [#?@(:cljs [dissoc conj]
@@ -1021,9 +1016,8 @@
 
 --Expected
 (ns com.example.my-app
-  (:refer-clojure
-    :exclude #?@(:clj [frequencies int partition]
-                 :cljs [conj dissoc])))
+  #?(:clj (:refer-clojure :exclude [frequencies int partition])
+     :cljs (:refer-clojure :exclude [conj dissoc])))
 --Expected
 
 # refer-clojure with reader conditionals 6
@@ -1378,9 +1372,8 @@
 
 --Expected
 (ns com.example.my-app
-  (:refer-clojure
-    :exclude #?@(:clj [aaa bbb ccc]
-                 :cljs [aaa ddd])))
+  #?(:clj (:refer-clojure :exclude [aaa bbb ccc])
+     :cljs (:refer-clojure :exclude [aaa ddd])))
 --Expected
 
 # GitHub Issue #55 - metadata in ns 1
@@ -1543,9 +1536,8 @@
 
 --Expected
 (ns cljs.analyzer
-  (:refer-clojure
-    :exclude #?@(:clj [ensure macroexpand-1]
-                 :cljs [ensure js-reserved macroexpand-1 ns-interns]))
+  #?(:clj (:refer-clojure :exclude [ensure macroexpand-1])
+     :cljs (:refer-clojure :exclude [ensure js-reserved macroexpand-1 ns-interns]))
   #?(:cljs
      (:require-macros
       [cljs.analyzer.macros :refer [allowing-redef disallowing-ns* disallowing-recur no-warn with-warning-handlers wrapping-errors]]
@@ -2086,3 +2078,19 @@
    :impl-ns iii
    :load-impl-ns false)) ;; hhh
 --Expected
+
+# GitHub Issue #210 - bug with refer-clojure and reader conditionals
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/210
+
+--Input
+(ns repro
+  #?(:cljs (:refer-clojure :exclude [juxt])
+     :clj  (:refer-clojure :exclude [juxt format])))
+--Input
+
+--Expected
+(ns repro
+  #?(:clj (:refer-clojure :exclude [format juxt])
+     :cljs (:refer-clojure :exclude [juxt])))
+--Expected