Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit43f7a67

Browse files
rrudakovbbatsov
authored andcommitted
[CI] Fix compilation for Emacs-30
1 parentce94748 commit43f7a67

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
##main (unreleased)
44

5-
- Add a dedicated mode for editing Joker code. (`clojure-ts-joker-mode`)
5+
- Add a dedicated mode for editing Joker code. (`clojure-ts-joker-mode`).
6+
-[#113](https://github.com/clojure-emacs/clojure-ts-mode/pull/113): Fix non-working refactoring commands for Emacs-30.
67

78
##0.5.1 (2025-06-17)
89

‎clojure-ts-mode.el

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,8 +1129,8 @@ See `clojure-ts--standard-definition-node-name' for the implementation used.")
11291129

11301130
(defunclojure-ts--outline-level ()
11311131
"Return the current level of the outline heading at point."
1132-
(let* ((node (treesit-outline--at-point))
1133-
(node-text (treesit-node-text node)))
1132+
(when-let* ((node (treesit-thing-at (point)#'clojure-ts--outline-predicate))
1133+
(node-text (treesit-node-text node)))
11341134
(string-match";;\\(;+\\)" node-text)
11351135
(- (match-end1) (match-beginning1))))
11361136

@@ -1873,7 +1873,7 @@ between BEG and END."
18731873
;; We have to disable it here to avoid endless recursion.
18741874
(clojure-ts-align-forms-automaticallynil))
18751875
(save-excursion
1876-
(indent-region beg end)
1876+
(indent-region beg(marker-positionend))
18771877
(dolist (sexp sexps-to-align)
18781878
;; After reindenting a node, all other nodes in the`sexps-to-align'
18791879
;; list become outdated, so we need to fetch updated nodes for every
@@ -1893,7 +1893,7 @@ between BEG and END."
18931893
;; After every iteration we have to re-indent the s-expression,
18941894
;; otherwise some can be indented inconsistently.
18951895
(indent-region (marker-position (plist-get sexp:beg-marker))
1896-
(plist-get sexp:end-marker))))
1896+
(marker-position (plist-get sexp:end-marker)))))
18971897
;; If`clojure-ts-align-separator' is used,`align-region' leaves trailing
18981898
;; whitespaces on empty lines.
18991899
(delete-trailing-whitespace beg (marker-position end)))))
@@ -2114,7 +2114,7 @@ With universal argument \\[universal-argument], fully unwinds thread."
21142114
(clojure-ts--pop-out-of-threading)
21152115
(clojure-ts--fix-sexp-whitespace)
21162116
(setq n0))))
2117-
(indent-region begend)
2117+
(indent-region(marker-positionbeg) (marker-positionend))
21182118
(delete-trailing-whitespace beg end)))
21192119
(user-error"No threading form to unwind at point")))
21202120

@@ -2191,7 +2191,7 @@ cannot be found."
21912191
(clojure-ts--thread-first))
21922192
((string-match-p (rx bol (*"some")"->>" eol) sym)
21932193
(clojure-ts--thread-last)))
2194-
(indent-region begend)
2194+
(indent-region(marker-positionbeg) (marker-positionend))
21952195
(delete-trailing-whitespace beg end)
21962196
t)
21972197
(when called-by-user-p
@@ -2383,7 +2383,7 @@ type, etc. See `treesit-thing-settings' for more details."
23832383
(string= parent-def-sym"extend-protocol"))
23842384
(clojure-ts--add-arity-reify-internal fn-node))
23852385
(t (clojure-ts--add-arity-internal fn-node)))
2386-
(indent-region beg-markerend-marker))
2386+
(indent-region(marker-positionbeg-marker) (marker-positionend-marker)))
23872387
(user-error"No suitable form to add an arity at point")))
23882388

23892389
(defunclojure-ts-cycle-keyword-string ()
@@ -2496,7 +2496,7 @@ before DELIM-OPEN."
24962496
(when (member cond-sym '("if""if-not"))
24972497
(forward-sexp2)
24982498
(transpose-sexps1))
2499-
(indent-region beg end-marker)))
2499+
(indent-region beg(marker-positionend-marker))))
25002500
(user-error"No conditional expression found")))
25012501

25022502
(defunclojure-ts-cycle-not ()
@@ -2512,7 +2512,7 @@ before DELIM-OPEN."
25122512
(clojure-ts--raise-sexp)
25132513
(insert-pair1?\(?\))
25142514
(insert"not"))
2515-
(indent-region beg end-marker)
2515+
(indent-region beg(marker-positionend-marker))
25162516
;;`save-excursion' doesn't work well when point is at the opening
25172517
;; paren.
25182518
(goto-char pos))

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp