From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: 60128@debbugs.gnu.org
Cc: casouri@gmail.com, Stefan Monnier <monnier@iro.umontreal.ca>
Subject: bug#60128: 30.0.50; [PATCH]: Add treesit-transpose-sexps
Date: Sat, 17 Dec 2022 13:52:30 +0100 [thread overview]
Message-ID: <87edsytcoh.fsf@thornhill.no> (raw)
In-Reply-To: <87a63nru7n.fsf@thornhill.no> (Theodor Thornhill's message of "Fri, 16 Dec 2022 21:04:28 +0100")
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
Theodor Thornhill <theo@thornhill.no> writes:
> Hi there!
>
> Attached is a patch that enables transpose-sexps for tree-sitter enabled
> modes.
>
> This function will swap the node _before_ node-at-point with the node
> _after_, so it would do something like:
>
> foo a|nd bar => bar and foo|
>
> or
> foo(a + 4,| y + c * b, b, d); => foo(y + c * b, a + 4|, b, d);
>
> It will _not_ try to swap things that are not siblings. I think that
> makes sense in the case of non-lisp languages, since _most_ places you
> can transpose-sexps you will end up with broken code.
>
from 'transpose-subr-1':
(if (> (cdr pos1) (car pos2)) (error "Don't have two things to
transpose"))
I added this hack into the function in the patch, but I think that
triggering an error is too much.
;; Hack to trigger the error message in `transpose-subr-1' when we
;; don't have siblings to swap.
(list (cons 0 1) (cons 0 1))))
I guess I could just follow suit in my function and do like in the
following patch:
Theo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-treesit-transpose-sexps.patch --]
[-- Type: text/x-diff, Size: 5756 bytes --]
From e26dc6ab62ddf7b60fcbe2532acdf9f8500c904f Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Thu, 15 Dec 2022 21:22:13 +0100
Subject: [PATCH] Add treesit-transpose-sexps
We don't really need to rely on forward-sexp to define what to
transpose. In tree-sitter we can consider siblings as "balanced
expressions", and swap them without doing any movement to calculate
where the siblings in question are.
* lisp/simple.el: Add requires for treesit.
* lisp/simple.el (transpose-sexps): If tree-sitter is available, use
treesit-transpose-sexps as the 'special' function.
(transpose-subr): Just use tree-sitter when available.
* lisp/treesit.el (treesit-transpose-sexps): New function.
---
lisp/simple.el | 67 ++++++++++++++++++++++++++-----------------------
lisp/treesit.el | 14 +++++++++++
2 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index dcc2242e49..15f7381f06 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -28,10 +28,12 @@
;;; Code:
-(eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'cl-lib)
+ (require 'treesit))
(declare-function widget-convert "wid-edit" (type &rest args))
(declare-function shell-mode "shell" ())
+(declare-function treesit-parser-list "treesit.c")
;;; From compile.el
(defvar compilation-current-error)
@@ -8453,36 +8455,37 @@ transpose-sexps
(transpose-sexps arg nil)
(scan-error (user-error "Not between two complete sexps")))
(transpose-subr
- (lambda (arg)
- ;; Here we should try to simulate the behavior of
- ;; (cons (progn (forward-sexp x) (point))
- ;; (progn (forward-sexp (- x)) (point)))
- ;; Except that we don't want to rely on the second forward-sexp
- ;; putting us back to where we want to be, since forward-sexp-function
- ;; might do funny things like infix-precedence.
- (if (if (> arg 0)
- (looking-at "\\sw\\|\\s_")
- (and (not (bobp))
- (save-excursion
- (forward-char -1)
- (looking-at "\\sw\\|\\s_"))))
- ;; Jumping over a symbol. We might be inside it, mind you.
- (progn (funcall (if (> arg 0)
- 'skip-syntax-backward 'skip-syntax-forward)
- "w_")
- (cons (save-excursion (forward-sexp arg) (point)) (point)))
- ;; Otherwise, we're between sexps. Take a step back before jumping
- ;; to make sure we'll obey the same precedence no matter which
- ;; direction we're going.
- (funcall (if (> arg 0) 'skip-syntax-backward 'skip-syntax-forward)
- " .")
- (cons (save-excursion (forward-sexp arg) (point))
- (progn (while (or (forward-comment (if (> arg 0) 1 -1))
- (not (zerop (funcall (if (> arg 0)
- 'skip-syntax-forward
- 'skip-syntax-backward)
- ".")))))
- (point)))))
+ (if (treesit-parser-list) #'treesit-transpose-sexps
+ (lambda (arg)
+ ;; Here we should try to simulate the behavior of
+ ;; (cons (progn (forward-sexp x) (point))
+ ;; (progn (forward-sexp (- x)) (point)))
+ ;; Except that we don't want to rely on the second forward-sexp
+ ;; putting us back to where we want to be, since forward-sexp-function
+ ;; might do funny things like infix-precedence.
+ (if (if (> arg 0)
+ (looking-at "\\sw\\|\\s_")
+ (and (not (bobp))
+ (save-excursion
+ (forward-char -1)
+ (looking-at "\\sw\\|\\s_"))))
+ ;; Jumping over a symbol. We might be inside it, mind you.
+ (progn (funcall (if (> arg 0)
+ 'skip-syntax-backward 'skip-syntax-forward)
+ "w_")
+ (cons (save-excursion (forward-sexp arg) (point)) (point)))
+ ;; Otherwise, we're between sexps. Take a step back before jumping
+ ;; to make sure we'll obey the same precedence no matter which
+ ;; direction we're going.
+ (funcall (if (> arg 0) 'skip-syntax-backward 'skip-syntax-forward)
+ " .")
+ (cons (save-excursion (forward-sexp arg) (point))
+ (progn (while (or (forward-comment (if (> arg 0) 1 -1))
+ (not (zerop (funcall (if (> arg 0)
+ 'skip-syntax-forward
+ 'skip-syntax-backward)
+ ".")))))
+ (point))))))
arg 'special)))
(defun transpose-lines (arg)
@@ -8521,6 +8524,8 @@ transpose-subr
(progn (funcall mover (- x)) (point))))))
pos1 pos2)
(cond
+ ((treesit-parser-list)
+ (apply #'transpose-subr-1 (funcall aux arg)))
((= arg 0)
(save-excursion
(setq pos1 (funcall aux 1))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 0df71d12ed..1504ad3482 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1623,6 +1623,20 @@ treesit--defun-maybe-top-level
node)
finally return node))))
+(defun treesit-transpose-sexps (&optional arg)
+ "Tree-sitter `transpose-sexps' function.
+Arg is the same as in `transpose-sexps'."
+ (if-let* ((node (treesit-node-at (point)))
+ (parent (treesit-node-parent node))
+ (index (treesit-node-index node))
+ (prev (treesit-node-child parent (1- index)))
+ (next (treesit-node-child parent (+ arg index))))
+ (list (cons (treesit-node-start prev)
+ (treesit-node-end prev))
+ (cons (treesit-node-start next)
+ (treesit-node-end next)))
+ (user-error "Don't have two things to transpose")))
+
(defun treesit-beginning-of-defun (&optional arg)
"Move backward to the beginning of a defun.
--
2.34.1
next prev parent reply other threads:[~2022-12-17 12:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 20:04 bug#60128: 30.0.50; [PATCH]: Add treesit-transpose-sexps Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-17 12:52 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2022-12-26 20:53 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-26 21:26 ` Yuan Fu
2022-12-26 22:37 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-27 11:56 ` Eli Zaretskii
2023-01-07 23:18 ` Yuan Fu
2023-01-08 11:56 ` Eli Zaretskii
2023-01-08 12:13 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-05 15:56 ` Stefan Kangas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edsytcoh.fsf@thornhill.no \
--to=bug-gnu-emacs@gnu.org \
--cc=60128@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=monnier@iro.umontreal.ca \
--cc=theo@thornhill.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.