From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun Date: Tue, 29 Nov 2022 16:15:19 +0200 Message-ID: <837czdn8y0.fsf@gnu.org> References: <874juig9ji.fsf@thornhill.no> <83lenum0jx.fsf@gnu.org> <87bkoqj6ua.fsf@thornhill.no> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11740"; mail-complaints-to="usenet@ciao.gmane.io" Cc: casouri@gmail.com, 59662@debbugs.gnu.org To: Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 15:15:33 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 1p01OW-0002lf-Va for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 15:15:33 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p01OE-0006gx-Hz; Tue, 29 Nov 2022 09:15:15 -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 1p01O4-0006eZ-Aw for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 09:15:04 -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 1p01O3-0004fk-QS for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 09:15:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p01O2-0002wI-Lz for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 09:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2022 14:15:02 +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.166973130111281 (code B ref 59662); Tue, 29 Nov 2022 14:15:02 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 29 Nov 2022 14:15:01 +0000 Original-Received: from localhost ([127.0.0.1]:54527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p01O0-0002vt-VI for submit@debbugs.gnu.org; Tue, 29 Nov 2022 09:15:01 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:46730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p01Nv-0002vl-Ub for 59662@debbugs.gnu.org; Tue, 29 Nov 2022 09:14:59 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p01No-0004bL-Ln; Tue, 29 Nov 2022 09:14:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=ssQEoXqiNbJha8kLprHd9cmQtI3K2wV2nFBH5DEbgF4=; b=ouuSYPpQIufF p8i8Ul4FWUpu17+kVCucuxID+pwK06in6VEqkTGL2fhuEDa5o3F+6sbum4Eil38iJ4BzsLiuUOSZg VhK+ZVkECryEFuVKKat/j3Pj96vWuA+804hVZFoWJ7JvyFCV7c9v/Uto9WuKl/kO0OWUUrefa10Rw Qc3b7ZvicZ+J/+ablDyctUKN73Db/PFbr7cbM1zbwVuAq/ZQj5QLsgUIUhCBnZSqP4r4tjYEtMgVG yWb4b7NJOTmGsbh4Rey+xerLERBj5SSPSfXvFYxRkbbRJorm7fom7KjV4HXlb0F8z9AeGgCBNqXuy BXPKLnSv6hjt9ShC7mNAcg==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p01Nm-0006zO-RB; Tue, 29 Nov 2022 09:14:47 -0500 In-Reply-To: <87bkoqj6ua.fsf@thornhill.no> (message from Theodor Thornhill on Tue, 29 Nov 2022 13:14:21 +0100) 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:249399 Archived-At: Resending with correct address of Yuan. > From: Theodor Thornhill > Cc: 59662@debbugs.gnu.org, casouri@gmail.org > Date: Tue, 29 Nov 2022 13:14:21 +0100 > > 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 >