Fix body indentation with meta data

Author: kommen

clojure-ts-mode.el

@@ -522,6 +522,10 @@ with the markdown_inline grammar."
   "Return non-nil if NODE is a Clojure keyword."
   (string-equal "kwd_lit" (treesit-node-type node)))
 
+(defun clojure-ts--meta-node-p (node)
+  "Return non-nil if NODE is a Clojure metadata node."
+  (string-equal "meta_lit" (treesit-node-type node) ))
+
 (defun clojure-ts--named-node-text (node)
   "Gets the name of a symbol or keyword NODE.
 This does not include the NODE's namespace."
@@ -726,22 +730,26 @@ https://github.com/weavejester/cljfmt/blob/fb26b22f569724b05c93eb2502592dfc2de89
          (or (clojure-ts--symbol-node-p first-child)
              (clojure-ts--keyword-node-p first-child)))))
 
-(defun clojure-ts--match-expression-in-body (_node parent _bol)
+(defun clojure-ts--match-expression-in-body (node parent _bol)
   "Match NODE if it is an expression used in a body argument.
 PARENT is expected to be a list literal.
 See `treesit-simple-indent-rules'."
   (and
    (clojure-ts--list-node-p parent)
-   (let ((first-child (treesit-node-child parent 0 t)))
+   (let* ((first-child (treesit-node-child parent 0 t))
+          (non-meta-first-child (if (clojure-ts--meta-node-p first-child)
+                                    (treesit-node-child parent 1 t)
+                                  first-child)))
      (and
       (not
        (clojure-ts--symbol-matches-p
         ;; Symbols starting with this are false positives
         (rx line-start (or "default" "deflate" "defer"))
-        first-child))
+        non-meta-first-child))
+      (not (clojure-ts--match-with-meta node parent _bol))
       (clojure-ts--symbol-matches-p
        clojure-ts--symbols-with-body-expressions-regexp
-       first-child)))))
+       non-meta-first-child)))))
 
 (defun clojure-ts--match-method-body (_node parent _bol)
   "Matches a `NODE' in the body of a `PARENT' method implementation.

test/samples/indentation.clj

@@ -136,3 +136,9 @@
   (^String [])
   (^java.util.List
    [a & args]))
+
+^{:foo true}
+(defn c
+  "hello"
+  [_foo]
+  (+ 1 1))