@@ -520,6 +520,10 @@ with the markdown_inline grammar."
520520 " Return non-nil if NODE is a Clojure keyword."
521521 (string-equal " kwd_lit" (treesit-node-type node)))
522522
523+ (defun clojure-ts--var-node-p (node )
524+ " Return non-nil if NODE is a var (eg. #\\ 'foo)."
525+ (string-equal " var_quoting_lit" (treesit-node-type node)))
526+
523527(defun clojure-ts--named-node-text (node )
524528 " Gets the name of a symbol or keyword NODE.
525529This does not include the NODE's namespace."
@@ -603,13 +607,13 @@ Includes a dispatch value when applicable (defmethods)."
603607 " Return non-nil if NODE is a ns form."
604608 (clojure-ts--definition-node-p " ns" node))
605609
606- (defvar clojure-ts--variable-type-regexp
610+ (defvar clojure-ts--variable-definition- type-regexp
607611 (rx string-start (or " def" " defonce" ) string-end)
608612 " Regular expression for matching definition nodes that resemble variables." )
609613
610- (defun clojure-ts--variable-node-p (node )
614+ (defun clojure-ts--variable-definition- node-p (node )
611615 " Return non-nil if NODE is a def or defonce form."
612- (clojure-ts--definition-node-match-p clojure-ts--variable-type-regexp node))
616+ (clojure-ts--definition-node-match-p clojure-ts--variable-definition- type-regexp node))
613617
614618(defvar clojure-ts--class-type-regexp
615619 (rx string-start (or " deftype" " defrecord" " defstruct" ) string-end)
@@ -634,7 +638,7 @@ Includes a dispatch value when applicable (defmethods)."
634638 ; ; Used instead of treesit-defun-name-function.
635639 clojure-ts--function-node-name)
636640 (" Macro" " list_lit" clojure-ts--defmacro-node-p)
637- (" Variable" " list_lit" clojure-ts--variable-node-p)
641+ (" Variable" " list_lit" clojure-ts--variable-definition- node-p)
638642 (" Interface" " list_lit" clojure-ts--interface-node-p)
639643 (" Class" " list_lit" clojure-ts--class-node-p))
640644 " The value for `treesit-simple-imenu-settings' .
@@ -722,7 +726,8 @@ https://github.com/weavejester/cljfmt/blob/fb26b22f569724b05c93eb2502592dfc2de89
722726 (not (treesit-node-eq (treesit-node-child parent 1 t ) node))
723727 (let ((first-child (treesit-node-child parent 0 t )))
724728 (or (clojure-ts--symbol-node-p first-child)
725- (clojure-ts--keyword-node-p first-child)))))
729+ (clojure-ts--keyword-node-p first-child)
730+ (clojure-ts--var-node-p first-child)))))
726731
727732(defun clojure-ts--match-expression-in-body (_node parent _bol )
728733 " Match NODE if it is an expression used in a body argument.
0 commit comments