Skip to content

Commit 5f16fb8

Browse files
committed
Re-enable workaround for treesit-transpose-sexps bug
See issue #17, specifically #17 (comment)
1 parent a90be05 commit 5f16fb8

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
@@ -2,7 +2,6 @@
22

33
## main (unreleased)
44

5-
- Re-enable treesit-transpose-sexps on Emacs 30 after fixes released by @casouri.
65
- Pin grammar revision in treesit-language-source-alist
76
- Make font lock feature list more conforming with recommendations
87
- (See treesit-font-lock-level documentation for more information.)

clojure-ts-mode.el

+8-3
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,8 @@ forms like deftype, defrecord, reify, proxy, etc."
790790

791791
(defconst clojure-ts--thing-settings
792792
`((clojure
793-
((sexp ,(regexp-opt clojure-ts--sexp-nodes))
794-
(text ,(regexp-opt '("comment")))))))
793+
(sexp ,(regexp-opt clojure-ts--sexp-nodes)
794+
text ,(regexp-opt '("comment"))))))
795795

796796
(defvar clojure-ts-mode-map
797797
(let ((map (make-sparse-keymap)))
@@ -883,7 +883,12 @@ See `clojure-ts--font-lock-settings' for usage of MARKDOWN-AVAILABLE."
883883
(when (eq clojure-ts--debug 'font-lock)
884884
(setq-local treesit--font-lock-verbose t))
885885
(treesit-inspect-mode))
886-
(treesit-major-mode-setup))))
886+
(treesit-major-mode-setup)
887+
;; Workaround for treesit-transpose-sexps not correctly working with
888+
;; treesit-thing-settings on Emacs 30.
889+
;; Once treesit-transpose-sexps it working again this can be removed
890+
(when (fboundp 'transpose-sexps-default-function)
891+
(setq-local transpose-sexps-function #'transpose-sexps-default-function)))))
887892

888893
;;;###autoload
889894
(define-derived-mode clojurescript-ts-mode clojure-ts-mode "ClojureScript[TS]"

0 commit comments

Comments
 (0)