DEV: Treat uneval nodes as comments in ns sorting

weavejester · Jul 2, 2022 · 008f5ab · 008f5ab
1 parent c686ae5
commit 008f5ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cljfmt/src/cljfmt/core.cljc b/cljfmt/src/cljfmt/core.cljc
@@ -427,10 +427,10 @@
        :end   end})))
 
 (defn- find-elements-with-comments [nodes]
-  (re-seq-matcher #"(CNS*)*E(S*C)?"
+  (re-seq-matcher #"(CNS*)*E(S*C)*"
                   #(case (n/tag %)
                      (:whitespace :comma) \S
-                     :comment \C
+                     (:comment :uneval) \C
                      :newline \N
                      \E)
                   nodes))
@@ -467,7 +467,7 @@
 
 
 (defn- node-sort-string [nodes]
-  (-> (remove (some-fn n/comment? n/whitespace?) nodes)
+  (-> (remove (some-fn n/comment? n/whitespace? #(-> % n/tag (= :uneval))) nodes)
       (nodes-string)
       (str/replace #"[\[\]\(\)\{\}]|\^[:\w-]+" "")
       (str/trim)))