all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun
@ 2022-11-28 19:32 Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
       [not found] ` <handler.59662.B.16696639455818.ack@debbugs.gnu.org>
                   ` (5 more replies)
  0 siblings, 6 replies; 97+ messages in thread
From: Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2022-11-28 19:32 UTC (permalink / raw)
  To: 59662; +Cc: eliz, casouri

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]


Hi Eli and Yuan!

I've added a function to treesit.el, for use in
treesit-major-mode-setup.  Because the treesit-defun-type-regexp gives
us "defuns" for free, we can set fill-paragraph-function to this new
function, thus enabling quick formatting, and some sensible default for
fill-paragraph.  It aims to mirror c-indent-defun.

I think this is a nice way to get this functionality for free, but I'm
not 100% whether this is considered ok or not.

An alternative could be to add a 'treesit-mode-map' where we can
auto-enable such constructs.


Feel free to apply if it looks ok.

Theo



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-treesit-indent-defun.patch --]
[-- Type: text/x-diff, Size: 2035 bytes --]

From aed3f136d530c0eaa83c385cac7388c853b4f99a Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Mon, 28 Nov 2022 20:19:20 +0100
Subject: [PATCH] Add treesit--indent-defun

We can piggyback on the already existing 'treesit-defun-type-regexp'
to decide a scope to reindent/reformat.  By setting
fill-paragraph-function major modes that implement
'treesit-defun-type-regexp' will get this functionality for free, by
default bound to M-q.

* lisp/treesit.el (treesit--indent-defun): New function.
(treesit-major-mode-setup): Enable this functionality when prereqs are
fulfilled.
---
 lisp/treesit.el | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 8f092f475d..685c59aedb 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1451,6 +1451,21 @@ treesit-simple-indent
                         (message "No matched rule"))
                       (cons nil nil))))))
 
+(defun treesit--indent-defun (&optional _arg)
+  "Indent the current defun.
+
+Uses `treesit-defun-type-regexp' to determine which nodes to
+reindent."
+  (interactive)
+  (when-let ((defun-node
+              (save-excursion
+                (treesit-search-forward-goto
+                 (treesit-node-at (point))
+                 treesit-defun-type-regexp t t))))
+    (treesit-indent-region
+     (treesit-node-start defun-node)
+     (treesit-node-end defun-node))))
+
 (defun treesit-check-indent (mode)
   "Check current buffer's indentation against a major mode MODE.
 
@@ -1698,7 +1713,10 @@ treesit-major-mode-setup
   ;; Navigation.
   (when treesit-defun-type-regexp
     (setq-local beginning-of-defun-function #'treesit-beginning-of-defun)
-    (setq-local end-of-defun-function #'treesit-end-of-defun)))
+    (setq-local end-of-defun-function #'treesit-end-of-defun))
+  ;; Filling
+  (when (and treesit-defun-type-regexp treesit-simple-indent-rules)
+    (setq-local fill-paragraph-function #'treesit--indent-defun)))
 
 ;;; Debugging
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 97+ messages in thread

end of thread, other threads:[~2023-01-07 23:01 UTC | newest]

Thread overview: 97+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-28 19:32 bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
     [not found] ` <handler.59662.B.16696639455818.ack@debbugs.gnu.org>
2022-11-29  6:10   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-29 12:01 ` Eli Zaretskii
2022-11-29 12:14   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-29 14:15     ` Eli Zaretskii
2022-11-30 10:33 ` Yuan Fu
2022-11-30 23:23 ` Yuan Fu
2022-12-01  1:07   ` Yuan Fu
2022-12-01  7:19     ` Eli Zaretskii
2022-12-01  6:10   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-01  7:13   ` Eli Zaretskii
2022-12-01  7:22     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-01  7:48       ` Eli Zaretskii
2022-12-01  8:13         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 15:06         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 15:45           ` Eli Zaretskii
2022-12-02 18:32             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 18:52               ` Eli Zaretskii
2022-12-02 19:02           ` Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 20:24             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 21:09               ` Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 21:19                 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-04 12:33                   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-04 12:40                     ` Eli Zaretskii
2022-12-07  9:31                       ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07 13:44                         ` Eli Zaretskii
2022-12-02 19:53     ` Dmitry Gutov
2022-12-02 20:01       ` Dmitry Gutov
2022-12-02 20:07       ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 22:27         ` Dmitry Gutov
2022-12-03  6:47           ` Eli Zaretskii
2022-12-03 15:59             ` Dmitry Gutov
2022-12-03 17:54               ` Eli Zaretskii
2022-12-08  1:37                 ` Dmitry Gutov
2022-12-08  7:16                   ` Eli Zaretskii
2022-12-08  8:11                     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08  8:27                       ` Eli Zaretskii
2022-12-08  8:56                         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08  9:08                           ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 10:39                           ` Eli Zaretskii
2022-12-08 11:09                             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 11:38                               ` Eli Zaretskii
2022-12-08 14:22                               ` Dmitry Gutov
2022-12-08 14:58                                 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 16:06                                   ` Dmitry Gutov
2022-12-08 16:33                                     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 22:03                                       ` Dmitry Gutov
2022-12-08 14:18                           ` Dmitry Gutov
2022-12-08 14:53                             ` Eli Zaretskii
2022-12-08 15:43                               ` Dmitry Gutov
2022-12-08 16:04                                 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 16:23                                   ` Dmitry Gutov
2022-12-08 19:15                                     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 19:50                                       ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 20:12                                       ` Eli Zaretskii
2022-12-08 21:21                                         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09  5:06                                           ` Eli Zaretskii
2022-12-09 13:24                                             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 13:38                                               ` Dmitry Gutov
2022-12-09 14:46                                                 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 14:56                                                   ` Dmitry Gutov
2022-12-09 15:13                                                     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 15:27                                                       ` Dmitry Gutov
2022-12-09 15:29                                                         ` Dmitry Gutov
2022-12-09 15:50                                                         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 16:05                                                           ` Dmitry Gutov
2022-12-09 19:15                                                             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 20:28                                                               ` Dmitry Gutov
2022-12-09 20:31                                                                 ` Dmitry Gutov
2022-12-09 20:20                                                           ` Eli Zaretskii
2022-12-09 20:30                                                             ` Dmitry Gutov
2022-12-10 14:04                                                               ` Eli Zaretskii
2022-12-10 19:25                                                                 ` Dmitry Gutov
2022-12-09 21:09                                                             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-10 12:02                                                               ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-10 14:27                                                                 ` Eli Zaretskii
2022-12-10 14:09                                                               ` Eli Zaretskii
2022-12-10 20:21                                                                 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-11  8:11                                                                   ` Eli Zaretskii
2022-12-11  8:39                                                                     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-11 10:03                                                                       ` Eli Zaretskii
2022-12-11 14:13                                                                         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-11 20:36                                                                           ` Dmitry Gutov
2022-12-11 20:39                                                                             ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 22:05                                       ` Dmitry Gutov
2022-12-08 22:10                                         ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 22:49                                           ` Dmitry Gutov
2022-12-08 14:24                     ` Dmitry Gutov
2022-12-08 15:37                       ` Dmitry Gutov
2022-12-08 15:46                         ` Eli Zaretskii
2022-12-07 19:54 ` Yuan Fu
2022-12-07 20:06   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07 21:40     ` Yuan Fu
2022-12-07 21:53       ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07 23:09         ` Yuan Fu
2022-12-08  6:02           ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-07 23:01 ` Yuan Fu

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.