emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/clojure-ts-mode f11b680b6b 2/2: Add changelog entry and a


From: ELPA Syncer
Subject: [nongnu] elpa/clojure-ts-mode f11b680b6b 2/2: Add changelog entry and a note for reasoning about `treesit-defun-type-regexp`
Date: Sun, 11 Feb 2024 15:59:44 -0500 (EST)

branch: elpa/clojure-ts-mode
commit f11b680b6b6adaf6748800b7e64ed7e265d6e9ba
Author: Dieter Komendera <dieter@komendera.com>
Commit: Bozhidar Batsov <bozhidar@batsov.dev>

    Add changelog entry and a note for reasoning about 
`treesit-defun-type-regexp`
---
 CHANGELOG.md       |  1 +
 clojure-ts-mode.el | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 238bb73408..7e654cfb91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## main (unreleased)
 
 - Add custom option `clojure-ts-toplevel-inside-comment-form` as an equivalent 
to `clojure-toplevel-inside-comment-form` in clojure-mode (#30)
+- Change behavior of `beginning-of-defun` and `end-of-defun` to consider all 
Clojure sexps as defuns (#32)
 
 ## 0.2.0
 
diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el
index c98ca45cf5..65328e77e8 100644
--- a/clojure-ts-mode.el
+++ b/clojure-ts-mode.el
@@ -917,10 +917,13 @@ See `clojure-ts--font-lock-settings' for usage of 
MARKDOWN-AVAILABLE."
   (setq-local treesit-defun-prefer-top-level t)
   (setq-local treesit-defun-tactic 'top-level)
   (setq-local treesit-defun-type-regexp
-              (cons (regexp-opt clojure-ts--sexp-nodes)
-                    (lambda (node)
-                      (or (not clojure-ts-toplevel-inside-comment-form)
-                          (not (clojure-ts--definition-node-p "comment" 
node))))))
+              (cons
+               ;; consider all clojure sexps as valid top level forms...
+               (regexp-opt clojure-ts--sexp-nodes)
+               ;; ...except `comment' forms if 
`clojure-ts-toplevel-inside-comment-form' is set
+               (lambda (node)
+                 (or (not clojure-ts-toplevel-inside-comment-form)
+                     (not (clojure-ts--definition-node-p "comment" node))))))
   (setq-local treesit-simple-indent-rules
               (clojure-ts--configured-indent-rules))
   (setq-local treesit-defun-name-function



reply via email to

[Prev in Thread] Current Thread [Next in Thread]