From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun Date: Tue, 29 Nov 2022 13:14:21 +0100 Message-ID: <87bkoqj6ua.fsf@thornhill.no> References: <874juig9ji.fsf@thornhill.no> <83lenum0jx.fsf@gnu.org> Reply-To: Theodor Thornhill Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8614"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59662@debbugs.gnu.org, casouri@gmail.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 13:33:40 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ozznv-00022I-Gh for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 13:33:39 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozzWE-0005G7-CK; Tue, 29 Nov 2022 07:15:22 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozzVw-0005DR-VU for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 07:15:07 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozzVv-00051m-Jc for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 07:15:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozzVv-0007x9-FX for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 07:15:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2022 12:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59662 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59662-submit@debbugs.gnu.org id=B59662.166972407430523 (code B ref 59662); Tue, 29 Nov 2022 12:15:03 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 29 Nov 2022 12:14:34 +0000 Original-Received: from localhost ([127.0.0.1]:54365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozzVR-0007wF-JG for submit@debbugs.gnu.org; Tue, 29 Nov 2022 07:14:33 -0500 Original-Received: from out2.migadu.com ([188.165.223.204]:29597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozzVI-0007vq-Og for 59662@debbugs.gnu.org; Tue, 29 Nov 2022 07:14:26 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1669724063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lwRTTQh3Ax4BGDUzXp4rLuJm8vyFii4NIOR6OSOPPfc=; b=G4UbUwM7rDrnZ5JpgE+Oi9E3yX8XwNsDG3xadYwksnJV7MKu8XGU7PiZb4jVPrlXx6y1tn JxLP2u6MgPKsAlwOcYH/Jc9QC8lvZAgXpxJQxfwxZv1Xo5XKLjlI5lyJkZNRb/pgkXqudz sjSaEVIqFTZtRVHBVpKqDJ7QMZy8HPc828E9r93TeqK/cDvehPvOTaZQECnYzHnSyNU9RT vw3umACmrUac1YpnTQg0pPpK55t0Qrw/A/MbKNNKyIVKG2RDEhgzx8ZDfsFRoa8eX+I9cV ivvyXzqO9xpzqHZ420VjUmDNMFFNWh2wiayNC9cI1nYVsd4vex/E1zA1SgRtUw== In-Reply-To: <83lenum0jx.fsf@gnu.org> X-Migadu-Flow: FLOW_OUT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:249386 Archived-At: Eli Zaretskii writes: >> Cc: eliz@gnu.org, casouri@gmail.org >> From: Theodor Thornhill >> 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. Theo