From: Yuan Fu <casouri@gmail.com>
To: Theodor Thornhill <theo@thornhill.no>
Cc: Eli Zaretskii <eliz@gnu.org>, 59662@debbugs.gnu.org, casouri@gmail.org
Subject: bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun
Date: Wed, 30 Nov 2022 15:23:17 -0800 [thread overview]
Message-ID: <5B538888-E454-4F75-B3B8-AB20E10B3E89@gmail.com> (raw)
In-Reply-To: <874juig9ji.fsf@thornhill.no>
Theodor Thornhill <theo@thornhill.no> writes:
> Eli Zaretskii <eliz@gnu.org> writes:
>
>>> Cc: eliz@gnu.org, casouri@gmail.org
>>> From: Theodor Thornhill <theo@thornhill.no>
>>> Date: Mon, 28 Nov 2022 20:32:01 +0100
>>>
>>> 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.
>>
>> Sounds good, but why did you think it wouldn't be OK? Anything here that
>> doesn't meet the eye?
>>
>
> Not really, but see below answer.
>
>>> An alternative could be to add a 'treesit-mode-map' where we can
>>> auto-enable such constructs.
>>
>> I think this is less desirable.
>>
>> Yuan, WDYT?
>>
>>> @@ -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)))
>>
>> I'm a bit confused: if the function's name is treesit--indent-defun, and it
>> uses treesit-indent-region to do its job, why do we assign it to
>> fill-paragraph-function, which is supposed to _fill_, not to _indent_?
>
> This is why I was thinking it would maybe be better to put it into a
> treesit-mode-map that major-modes can inherit from, thus binding it to
> things such as C-c C-q. The reason I put it in filling was because that
> is a common key to press in everything _but_ prog-modes. And prog-modes
> seem to mostly just turn it off if not inside of comments etc. This
> would behave just like that, except we would reformat/reindent/refill
> code.
>
> In a way filling _is_ formatting/reindenting, at least that's how I look
> at it.
I see, so you want to implement C-c C-q in c-mode. But why don’t we
make treesit--indent-defun a command and bind it in C-c C-q in major modes?
Filling is not indent IMO. If you fill a list in elisp code it wraps long lines
instead of indent (IIRC).
Also, this is really not tree-sitter specific, it doesn’t require any
tree-sitter feature to accomplish: indent-defun only needs mark-defun
and indent-region, both are supported by practically any major mode.
Normally this kind of thing goes into lisp.el, alongside commands like
fill-paragraph, indent-region, beginning-of-defun, etc, and claim a
global keybinding. But maybe we only want it to live under C-c prefix,
in that case I guess we can bind it in prog-mode-map, under C-c C-q?
I’m thinking something like
(defun prog-mode-indent-defun ()
(interactive)
(mark-defun)
(indent-region (region-beginning) (region-end)))
(defvar prog-mode-map
(...
(define-key map (kbd "C-c C-q") #'prog-mode-indent-defun)))
Yuan
next prev parent reply other threads:[~2022-11-30 23:23 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
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=5B538888-E454-4F75-B3B8-AB20E10B3E89@gmail.com \
--to=casouri@gmail.com \
--cc=59662@debbugs.gnu.org \
--cc=casouri@gmail.org \
--cc=eliz@gnu.org \
--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.