Merge branch 'frankitox-fix-vary-meta-issue'

NoahTheDuke · May 9, 2024 · d1d3a54 · d1d3a54
2 parents a5bbba2 + 5cf74b8
commit d1d3a54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/kibit/replace.clj b/src/kibit/replace.clj
@@ -71,11 +71,14 @@
                          (-> zipper rewrite.zip/node meta :row)))
       (recur (rewrite.zip/edit zipper
                                (fn -replace-zipper [sexpr]
-                                 (vary-meta (:alt check-map)
-                                            (fn -remove-loc [m]
-                                              (dissoc m
-                                                      :line
-                                                      :column)))))
+                                 (let [alt (:alt check-map)]
+                                   (if (meta alt)
+                                     (vary-meta alt
+                                                (fn -remove-loc [m]
+                                                  (dissoc m
+                                                          :line
+                                                          :column)))
+                                     alt))))
              reporter
              kw-opts)
       zipper)

diff --git a/test/kibit/test/replace.clj b/test/kibit/test/replace.clj
@@ -19,6 +19,9 @@
     '(inc a)
     '(+ 1 a)
 
+    '1
+    '(do 1)
+
     '(defn "Documentation" ^{:my-meta 1} [a]
        ;; a comment
        (inc a))
@@ -38,6 +41,9 @@
     "(inc a)"
     "(+ 1 a)"
 
+    "1"
+    "(do 1)"
+
     "(ns replace-file)
 
      (defn \"Documentation\" ^{:my-meta 1} [a]