Skip to content

Commit f11b680

Browse files
kommenbbatsov
authored andcommitted
Add changelog entry and a note for reasoning about treesit-defun-type-regexp
1 parent ca102cc commit f11b680

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## main (unreleased)
44

55
- Add custom option `clojure-ts-toplevel-inside-comment-form` as an equivalent to `clojure-toplevel-inside-comment-form` in clojure-mode (#30)
6+
- Change behavior of `beginning-of-defun` and `end-of-defun` to consider all Clojure sexps as defuns (#32)
67

78
## 0.2.0
89

clojure-ts-mode.el

+7-4
Original file line numberDiff line numberDiff line change
@@ -917,10 +917,13 @@ See `clojure-ts--font-lock-settings' for usage of MARKDOWN-AVAILABLE."
917917
(setq-local treesit-defun-prefer-top-level t)
918918
(setq-local treesit-defun-tactic 'top-level)
919919
(setq-local treesit-defun-type-regexp
920-
(cons (regexp-opt clojure-ts--sexp-nodes)
921-
(lambda (node)
922-
(or (not clojure-ts-toplevel-inside-comment-form)
923-
(not (clojure-ts--definition-node-p "comment" node))))))
920+
(cons
921+
;; consider all clojure sexps as valid top level forms...
922+
(regexp-opt clojure-ts--sexp-nodes)
923+
;; ...except `comment' forms if `clojure-ts-toplevel-inside-comment-form' is set
924+
(lambda (node)
925+
(or (not clojure-ts-toplevel-inside-comment-form)
926+
(not (clojure-ts--definition-node-p "comment" node))))))
924927
(setq-local treesit-simple-indent-rules
925928
(clojure-ts--configured-indent-rules))
926929
(setq-local treesit-defun-name-function

0 commit comments

Comments
 (0)