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 07:10:23 +0100 Message-ID: <87sfi2jnow.fsf@thornhill.no> References: <874juig9ji.fsf@thornhill.no> Reply-To: Theodor Thornhill Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31783"; mail-complaints-to="usenet@ciao.gmane.io" Cc: casuri@gmail.com To: 59662@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 07:11:45 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 1oztqJ-00083k-9E for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 07:11:43 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oztpn-0000oN-7d; Tue, 29 Nov 2022 01:11:11 -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 1oztpg-0000nY-LY for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 01:11:08 -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 1oztpe-0003xQ-VZ for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 01:11:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oztpd-00044P-Uw for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 01:11:01 -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 06:11:01 +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.166970223415638 (code B ref 59662); Tue, 29 Nov 2022 06:11:01 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 29 Nov 2022 06:10:34 +0000 Original-Received: from localhost ([127.0.0.1]:53375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oztpC-00044A-4N for submit@debbugs.gnu.org; Tue, 29 Nov 2022 01:10:34 -0500 Original-Received: from out2.migadu.com ([188.165.223.204]:36066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oztp9-000444-5B for 59662@debbugs.gnu.org; Tue, 29 Nov 2022 01:10:32 -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=1669702229; 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=yNiU0ngKyt40G+5Nx8lfiYM3volYv+cCGH5HkAza9c8=; b=YC6/snX1uPABpy0q90iEXd/Xnpp747oDk3Gm7gKGZagFm6K5nUs3ix+BpG3obYnIC2UMgK csaQKvpKHLAMEStGxp7rXjfuFn07N3g6lLXQCstz/U7euhXAQ6pdYN+ikgIewbPgOYLsK5 FEKglmKEiAnolydD97XTdqgGDeWi+yXVZ6GX98gEA4w1XR5L7htzqIGu4UB5y/+0nWQChX o4vgjLnEw/2segrOfYgL8yzwdeSZurzzBdWGoH2GJjf4nSt4tSewZ87hLOHqf4r9QJWpXM E+BmA+FdHGpKpf3PHbcTjygnmfYqnd9tTQ+Y8Mdu/b30oluhMy277wGgKgQG1w== In-Reply-To: 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:249367 Archived-At: --=-=-= Content-Type: text/plain Rebased on newest emacs-29 and added bug number in commit. Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-treesit-indent-defun.patch >From 0a39367e16849ca10775ffbe08c2929f95df1470 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill 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. (bug#59662) --- 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 --=-=-=--