GitHub Issue #161 - namespaced map literal alignment (#163)

oakmac · Nov 27, 2024 · 37b5b3c · 37b5b3c
1 parent f7ed654
commit 37b5b3c
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/lib/standard-clojure-style.js b/lib/standard-clojure-style.js
@@ -797,7 +797,7 @@
   }
 
   function isParenOpener (n) {
-    return n && n.name === '.open' && parenOpenersTbl[n.text]
+    return n && n.name === '.open' && (parenOpenersTbl[n.text] || isNamespacedMapOpener(n))
   }
 
   function isParenCloser (n) {
@@ -853,6 +853,10 @@
     return opener.text === '#('
   }
 
+  function isNamespacedMapOpener (opener) {
+    return opener.name === '.open' && strStartsWith(opener.text, '#:') && strEndsWith(opener.text, '{')
+  }
+
   function isReaderConditionalOpener (opener) {
     // TODO: also check node type here?
     return opener.text === '#?(' || opener.text === '#?@('
@@ -1240,6 +1244,8 @@
         return inc(openerColIdx)
       } else if (isAnonFnOpener(wrappingOpener)) {
         return openerColIdx + 3
+      } else if (isNamespacedMapOpener(wrappingOpener)) {
+        return openerColIdx + strLen(wrappingOpener.text)
       } else {
         // else indent two spaces from the wrapping opener
         return inc(inc(openerColIdx))

diff --git a/test_format/format.eno b/test_format/format.eno
@@ -1952,3 +1952,56 @@ hee, haz
   [& filters]
   `(clojure.core/refer '~'clojure.core ~@filters))
 --Expected
+
+# GitHub Issue #161 - namespaced map literals 1
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/161
+
+--Input
+(def my-vec
+ [#:xyz{:aaa "aaa"
+        :bbb "bbb"
+        :ccc "ccc"}
+
+  #:xyz{:ddd "ddd"
+        :eee "eee"
+        :fff "fff"}])
+--Input
+
+--Expected
+(def my-vec
+  [#:xyz{:aaa "aaa"
+         :bbb "bbb"
+         :ccc "ccc"}
+
+   #:xyz{:ddd "ddd"
+         :eee "eee"
+         :fff "fff"}])
+--Expected
+
+
+# GitHub Issue #161 - namespaced map literals 2
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/161
+
+--Input
+(def my-vec
+ [#:xyz{:aaa "aaa"
+ :bbb "bbb"
+ :ccc "ccc"}
+
+ #:xyz{:ddd "ddd"
+ :eee "eee"
+ :fff "fff"}])
+--Input
+
+--Expected
+(def my-vec
+  [#:xyz{:aaa "aaa"
+         :bbb "bbb"
+         :ccc "ccc"}
+
+   #:xyz{:ddd "ddd"
+         :eee "eee"
+         :fff "fff"}])
+--Expected