From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.bugs Subject: bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun Date: Wed, 7 Dec 2022 11:54:37 -0800 Message-ID: References: <874juig9ji.fsf@thornhill.no> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37130"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , 59662@debbugs.gnu.org, mardani29@yahoo.es To: Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 07 20:55:31 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 1p30Vu-0009SQ-SO for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 07 Dec 2022 20:55:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p30Va-0006g6-GV; Wed, 07 Dec 2022 14:55:10 -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 1p30VT-0006fi-M4 for bug-gnu-emacs@gnu.org; Wed, 07 Dec 2022 14:55:05 -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 1p30VS-0002kJ-1N for bug-gnu-emacs@gnu.org; Wed, 07 Dec 2022 14:55:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p30VR-0002nZ-Kt for bug-gnu-emacs@gnu.org; Wed, 07 Dec 2022 14:55:01 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <874juig9ji.fsf@thornhill.no> Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 07 Dec 2022 19:55: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.167044288910748 (code B ref 59662); Wed, 07 Dec 2022 19:55:01 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 7 Dec 2022 19:54:49 +0000 Original-Received: from localhost ([127.0.0.1]:51938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p30VE-0002nI-Nc for submit@debbugs.gnu.org; Wed, 07 Dec 2022 14:54:49 -0500 Original-Received: from mail-pg1-f178.google.com ([209.85.215.178]:40691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p30VB-0002nC-NT for 59662@debbugs.gnu.org; Wed, 07 Dec 2022 14:54:46 -0500 Original-Received: by mail-pg1-f178.google.com with SMTP id f9so17303993pgf.7 for <59662@debbugs.gnu.org>; Wed, 07 Dec 2022 11:54:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=1IyppNEhQU2gODlyXDVJB5y2AZTatN0zEQr9CbRPiko=; b=jDo0b4nU93LwfoGYBHZ+vt2+6XuMVeDTl+z3CVx2YdxK4ubX7UncSO8T9NO95HdWKW zuiCXf5RRKKA9J/fqODKz8tc4bgjGwy9xMlZvFhlsp2tLPVk46f5bVn5det0VJZzNuXF VHz+58/2BUIMRwhfwSNc+hTKLP6l1L3g6cHUVTDiW7wiake16xxn9j2HZpzoKFazMz/B 5hDjuMwclKe1sLN2YkPc5oO0k205L6DlW1L/nTSxK7SlbZ4KpO9NZ6MwDRuJe7JgjHLm Oor6joGM6POv3r+pYcDT0Rmz/1elEsWQttxq/gHV5mDJABp/h3/4Mn3HTWFBnXLeywvt jNlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1IyppNEhQU2gODlyXDVJB5y2AZTatN0zEQr9CbRPiko=; b=q5aA5gCZgZ7R7OLXDQhzg7uOHIGUjs5KzIWuTYtajXv/IXeYCuuTYAKf0HBipbo8SH 0S/RWPm8PaWq1uB+exZZZuW3+y8BkgBa43D7ofVZu6p1oXj0f/GeHyncclHU7tQKyRZF +QFs3iqXW6NUvbGixbiEj+XsijmMa1bfvQg+oRxbD5/DB9OHaX+BJXJa2MNJCibGpM4t EmfKe9isncgPXfcelfCA4UG3/H7eNGNXjtVe2ITMkNAvCOQNrBfRUSWZV7bOaMKEd+Uy f9nISkGB0v4+r3I1OJP2RS0tCkaZ6J4mIFu+F0KbIXosJ25Ix788/gyM0DwSAiQsEC48 S8eQ== X-Gm-Message-State: ANoB5pmPkC1ZC0lSKsmMg9uDGMAVVaQnY5AMvq7XiWpMBr4XdduKG+sm Y1FAeEr9+liN3XoPyhVQ8so= X-Google-Smtp-Source: AA0mqf56UH2D3kmJ5/a3d4U6VkR+CpmSY1QTnlzs46YRmfHCJgUQ3ALva2Np1Z2+oXst3siJ+zXTRg== X-Received: by 2002:a05:6a00:4308:b0:575:649c:e9e3 with SMTP id cb8-20020a056a00430800b00575649ce9e3mr43515251pfb.48.1670442879859; Wed, 07 Dec 2022 11:54:39 -0800 (PST) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id i22-20020a635416000000b00460ea630c1bsm11923567pgb.46.2022.12.07.11.54.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2022 11:54:39 -0800 (PST) X-Mailer: Apple Mail (2.3696.120.41.1.1) 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:250216 Archived-At: Theodor Thornhill writes: > Eli Zaretskii writes: > >>> From: Theodor Thornhill >>> Cc: "Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army = knife >>> of text editors" , Eli Zaretskii = , >>> casouri@gmail.com, 59662@debbugs.gnu.org >>> Date: Sun, 04 Dec 2022 13:33:35 +0100 >>>=20 >>> Theodor Thornhill writes: >>>=20 >>> > On 2 December 2022 22:09:55 CET, "Daniel Mart=C3=ADn" = wrote: >>> >>Theodor Thornhill writes: >>> >> >>> >>> Right - thanks. However, this makes me wonder - should we = really be >>> >>> setting mark here? I see that c-indent-defun does not, and it = feels >>> >>> weird that indenting adds to the mark ring. What do you think? = My >>> >>> first patch used >>> >>> >>> >>> (indent-region >>> >>> (treesit-node-start node) >>> >>> (treesit-node-end node)) >>> >>> >>> >>> Which behaves similarly to c-indent-defun. >>> >>> >>> >>> See attached patch. >>> >> >>> >>I don't have a strong opinion, but if we can indent without = setting the >>> >>mark, I think it'd be a cleaner command. Specially if = c-indent-defun >>> >>doesn't set the mark either. >>> > >>> > Yeah, we don't need to set the mark. Thanks for the feedback :) >>> > Theo >>>=20 >>> Eli, do you have any opinion on this matter? Should we implement = this >>> function without using marks? That will make the function a smidge >>> bigger, but would not mess up the mark-ring. I think that's = desirable, >>> at least. >> >> IMO, it is better not to set the mark, indeed. > > Agreed, see attached patch. What do you think, Yuan and Eli? > > Should we expose the internal helper I used, or maybe this function > could just as well live in treesit.c? > > Theo > Very nice, I applied this patch with some changes to the function. I think using treesit-beginning/end-of-defun is more robust. Yuan