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 14:01:54 +0200 Message-ID: <83lenum0jx.fsf@gnu.org> References: <874juig9ji.fsf@thornhill.no> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19909"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59662@debbugs.gnu.org, casouri@gmail.org To: Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 13:04:02 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 1ozzLG-0004v6-0C for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 13:04:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozzKu-0007j2-5B; Tue, 29 Nov 2022 07:03:40 -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 1ozzJj-0007a6-Ah for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 07:02:43 -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 1ozzJL-0001ow-5m for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 07:02:06 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozzJK-0007o4-2c for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 07:02: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 12:02: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.166972329229993 (code B ref 59662); Tue, 29 Nov 2022 12:02:02 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 29 Nov 2022 12:01:32 +0000 Original-Received: from localhost ([127.0.0.1]:54316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozzIq-0007nh-42 for submit@debbugs.gnu.org; Tue, 29 Nov 2022 07:01:32 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:46856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozzIo-0007nb-4L for 59662@debbugs.gnu.org; Tue, 29 Nov 2022 07:01:30 -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 1ozzIh-0001Y4-B2; Tue, 29 Nov 2022 07:01:24 -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=UoYRsqvRZJWOpktISJswaoHwMX4x1yvVPBYScpnOICA=; b=HiMlQmg5mM7G N+SKGCJq/sBNt1lsQP6TYaywOysFLAWpQwRhYoMCvvB81wkTJjkBj4CmHwcYjub7yuLUjBIWUxq2X Jq/HGId+PeZisj0iv2Z5E6DrNx58wBTK2PXacmkrqyd9H5l/6lmzGVXgP6LH6UGu5AF7pG1HT64Jr ql/d0mh7NTVwwxQDIAGU2/DSwVKjlLCT+cXuMlj/8UOWnTp/Jdh8Ua41rzuKIdyPCkTGorMkullSl QRwAF6BGCYSiuaZUoW3MHQcYEH7+n9cyE8Lc5fSxpSyqHrxL0GFzIHrFKM2AF937u1qFdNUuteA80 dja9TH07/9osssZeUd0tcw==; 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 1ozzIf-0005L1-KH; Tue, 29 Nov 2022 07:01:23 -0500 In-Reply-To: <874juig9ji.fsf@thornhill.no> (message from Theodor Thornhill on Mon, 28 Nov 2022 20:32:01 +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:249383 Archived-At: > 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? > 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_?