GitHub Issue #76 - fix bug with ns require-macros inside reader condi…

…tional (#79)
oakmac · Sep 5, 2024 · 1e1dc47 · 1e1dc47
1 parent e92db72
commit 1e1dc47
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/lib/standard-clojure-style.js b/lib/standard-clojure-style.js
@@ -2366,11 +2366,11 @@
 
     if (numRequireMacros > 0) {
       const cljsPlatformRequireMacros = filterOnPlatform(ns.requireMacros, ':cljs')
-      const requireMacrosWrappedInReaderConditional = arraySize(cljsPlatformRequireMacros) === numRequireMacros
+      const wrapRequireMacrosWithReaderConditional = arraySize(cljsPlatformRequireMacros) === numRequireMacros
       let rmLastLineCommentAfter = null
 
       let rmIndentation = '    '
-      if (requireMacrosWrappedInReaderConditional) {
+      if (wrapRequireMacrosWithReaderConditional) {
         outTxt = strConcat(outTxt, '\n')
         outTxt = strConcat(outTxt, '  #?(:cljs\n')
         outTxt = strConcat(outTxt, '     (:require-macros\n')
@@ -2402,15 +2402,15 @@
         rmIdx = inc(rmIdx)
       }
 
-      if (!requireMacrosIsLastMainForm && !requireMacrosWrappedInReaderConditional) {
+      if (!requireMacrosIsLastMainForm && !wrapRequireMacrosWithReaderConditional) {
         outTxt = strConcat(outTxt, ')')
-      } else if (!requireMacrosIsLastMainForm && requireMacrosWrappedInReaderConditional) {
+      } else if (!requireMacrosIsLastMainForm && wrapRequireMacrosWithReaderConditional) {
         outTxt = strConcat(outTxt, '))')
-      } else if (requireMacrosIsLastMainForm && !requireMacrosWrappedInReaderConditional) {
+      } else if (requireMacrosIsLastMainForm && !wrapRequireMacrosWithReaderConditional) {
         outTxt = strConcat(outTxt, '))')
         trailingParensArePrinted = true
-      } else if (requireMacrosIsLastMainForm && requireMacrosWrappedInReaderConditional) {
-        outTxt = strConcat(outTxt, '))))')
+      } else if (requireMacrosIsLastMainForm && wrapRequireMacrosWithReaderConditional) {
+        outTxt = strConcat(outTxt, ')))')
         trailingParensArePrinted = true
       }
 

diff --git a/test_format/ns.eno b/test_format/ns.eno
@@ -1123,3 +1123,36 @@
     [aaa.bbb]
     [ccc.ddd])) #_ #{"bugger"}
 --Expected
+
+# require-macros wrapped in reader conditional, last main form
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/76
+
+--Input
+(ns com.example.my-app
+  #?(:cljs (:require-macros [bar :refer [baz]])))
+--Input
+
+--Expected
+(ns com.example.my-app
+  #?(:cljs
+     (:require-macros
+       [bar :refer [baz]])))
+--Expected
+
+# require-macros wrapped in reader conditional, not last main form
+
+--Input
+(ns com.example.my-app
+  (:require [aaa])
+  #?(:cljs (:require-macros [bar :refer [baz]])))
+--Input
+
+--Expected
+(ns com.example.my-app
+  #?(:cljs
+     (:require-macros
+       [bar :refer [baz]]))
+  (:require
+    [aaa]))
+--Expected