@@ -524,7 +524,7 @@ with the markdown_inline grammar."
524524 " Return non-nil if NODE is a Clojure keyword."
525525 (string-equal " kwd_lit" (treesit-node-type node)))
526526
527- (defun clojure-ts--meta -node-p (node )
527+ (defun clojure-ts--metadata -node-p (node )
528528 " Return non-nil if NODE is a Clojure metadata node."
529529 (string-equal " meta_lit" (treesit-node-type node) ))
530530
@@ -538,10 +538,10 @@ This does not include the NODE's namespace."
538538 (and (clojure-ts--symbol-node-p node)
539539 (string-equal expected-symbol-name (clojure-ts--named-node-text node))))
540540
541- (defun clojure-ts--node-child-skip-meta (node n )
542- " Returns the Nth child of node like treesit-node-child, but skips the optional meta node at pos 0."
541+ (defun clojure-ts--node-child-skip-metadata (node n )
542+ " Return the Nth child of node like treesit-node-child, but skips the optional meta node at pos 0."
543543 (let* ((first-child (treesit-node-child node 0 t ))
544- (n1 (if (clojure-ts--meta -node-p first-child) (1+ n) n)))
544+ (n1 (if (clojure-ts--metadata -node-p first-child) (1+ n) n)))
545545 (treesit-node-child node n1 t )))
546546
547547(defun clojure-ts--symbol-matches-p (symbol-regexp node )
@@ -564,7 +564,7 @@ like \"defn\".
564564See `clojure-ts--definition-node-p' when an exact match is possible."
565565 (and
566566 (clojure-ts--list-node-p node)
567- (let* ((child (clojure-ts--node-child-skip-meta node 0 ))
567+ (let* ((child (clojure-ts--node-child-skip-metadata node 0 ))
568568 (child-txt (clojure-ts--named-node-text child)))
569569 (and (clojure-ts--symbol-node-p child)
570570 (string-match-p definition-type-regexp child-txt)))))
@@ -579,8 +579,8 @@ that a node is a definition is intended to be done elsewhere.
579579
580580Can be called directly, but intended for use as `treesit-defun-name-function' ."
581581 (when (and (clojure-ts--list-node-p node)
582- (clojure-ts--symbol-node-p (clojure-ts--node-child-skip-meta node 0 )))
583- (let ((sym (clojure-ts--node-child-skip-meta node 1 )))
582+ (clojure-ts--symbol-node-p (clojure-ts--node-child-skip-metadata node 0 )))
583+ (let ((sym (clojure-ts--node-child-skip-metadata node 1 )))
584584 (when (clojure-ts--symbol-node-p sym)
585585 ; ; Extracts ns and name, and recreates the full var name.
586586 ; ; We can't just get the node-text of the full symbol because
@@ -744,14 +744,14 @@ PARENT is expected to be a list literal.
744744See `treesit-simple-indent-rules' ."
745745 (and
746746 (clojure-ts--list-node-p parent)
747- (let* ((first-child (clojure-ts--node-child-skip-meta parent 0 )))
747+ (let* ((first-child (clojure-ts--node-child-skip-metadata parent 0 )))
748748 (and
749749 (not
750750 (clojure-ts--symbol-matches-p
751751 ; ; Symbols starting with this are false positives
752752 (rx line-start (or " default" " deflate" " defer" ))
753753 first-child))
754- (not (clojure-ts--match-with-meta node parent bol))
754+ (not (clojure-ts--match-with-metadata node parent bol))
755755 (clojure-ts--symbol-matches-p
756756 clojure-ts--symbols-with-body-expressions-regexp
757757 first-child)))))
@@ -823,11 +823,11 @@ forms like deftype, defrecord, reify, proxy, etc."
823823 (clojure-ts--match-fn-docstring parent)
824824 (clojure-ts--match-method-docstring parent))))
825825
826- (defun clojure-ts--match-with-meta (node _parent _bol )
826+ (defun clojure-ts--match-with-metadata (node _parent _bol )
827827 " Match NODE when it has metadata."
828828 (let ((prev-sibling (treesit-node-prev-sibling node)))
829829 (and prev-sibling
830- (clojure-ts--meta -node-p prev-sibling))))
830+ (clojure-ts--metadata -node-p prev-sibling))))
831831
832832(defun clojure-ts--semantic-indent-rules ()
833833 " Return a list of indentation rules for `treesit-simple-indent-rules' ."
@@ -841,7 +841,7 @@ forms like deftype, defrecord, reify, proxy, etc."
841841 (clojure-ts--match-threading-macro-arg prev-sibling 0 )
842842 ; ; https://guide.clojure.style/#vertically-align-fn-args
843843 (clojure-ts--match-function-call-arg (nth-sibling 2 nil ) 0 )
844- (clojure-ts--match-with-meta parent 0 )
844+ (clojure-ts--match-with-metadata parent 0 )
845845 ; ; Literal Sequences
846846 ((parent-is " list_lit" ) parent 1 ) ; ; https://guide.clojure.style/#one-space-indent
847847 ((parent-is " vec_lit" ) parent 1 ) ; ; https://guide.clojure.style/#bindings-alignment
0 commit comments