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 13:40:31 -0800 Message-ID: <840EC1DB-C322-494D-96DA-5D9582E0C8C5@gmail.com> References: <87a63zyo4k.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="7299"; 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 22:41:29 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 1p32AT-0001eU-2l for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 07 Dec 2022 22:41:29 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p32AC-0004LO-9p; Wed, 07 Dec 2022 16:41:13 -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 1p32A3-0004Km-5M for bug-gnu-emacs@gnu.org; Wed, 07 Dec 2022 16:41: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 1p32A2-0001HT-Rs for bug-gnu-emacs@gnu.org; Wed, 07 Dec 2022 16:41:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p32A2-0003e7-9F for bug-gnu-emacs@gnu.org; Wed, 07 Dec 2022 16:41:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 07 Dec 2022 21:41: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.167044924414001 (code B ref 59662); Wed, 07 Dec 2022 21:41:02 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 7 Dec 2022 21:40:44 +0000 Original-Received: from localhost ([127.0.0.1]:52362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p329k-0003dl-Av for submit@debbugs.gnu.org; Wed, 07 Dec 2022 16:40:44 -0500 Original-Received: from mail-pg1-f181.google.com ([209.85.215.181]:40742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p329f-0003df-Fy for 59662@debbugs.gnu.org; Wed, 07 Dec 2022 16:40:43 -0500 Original-Received: by mail-pg1-f181.google.com with SMTP id f9so17539941pgf.7 for <59662@debbugs.gnu.org>; Wed, 07 Dec 2022 13:40:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=fdYrSc+qyyjvnPZ3Ol3RAB5ER0WJAk4/vPwL14Ns3RY=; b=Tf6MM84eL92HnnISr9PIyk7bYzA7ivMRBiZYYzG9HNFZJE7xcdL9AZZ0m0/mP454j7 HlV1Fmp+0bXlsvz0LtVZ51H2m74JGOG7NcaOITnehTwN4lbDfhdnzuc8JF1stoB/+Ouc Jxnz+RAW3guFGPFY/TVfTST6Se0StsrfJb8XcOZCirsyB09qA03zJbz/bI3RK+idrwrQ v+L79KmMWvc2AiCIe5z0+tzDudCfS0frmS2IIOadO+O03ARpBkW9StDZ74FuHnaqrVG/ dybFYiauiSXWgnyRrol7h7qL28jzjE2ZiIzQwykJOxgV5bByeb5j215mZ6039r2o/Bwc X7qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fdYrSc+qyyjvnPZ3Ol3RAB5ER0WJAk4/vPwL14Ns3RY=; b=T3RRzZkoH8yjJQTVu+q2BT+sxKp4L0gLB6z9/rd69Zrs/EUSrQ5rZVGfJmAri2iP3W gc5CWmq86VAzOmkXRT856Ai4AwWY5hj0/p3blT68Jhm9XiVVYhy6VyT4qngAJ5WRRfQY 9WX1bOF3kwq96EgTIu+6vMyH2DWTWQ2huLbQhJB2JusKk7ck6jb+VM5i1i5RahugHVor bxoFRroJJNvozySS/q3czL+Dusyj/CJK4vLqbFvdWzzkNhyoD+4qbn8TvExLULQGoKTe 7IIv/Y/BA0rsps+40i/ulw/9XT3QN34TYVW/7V5UuCU8YXf/xJqTan8evDmbJODKwox/ THIg== X-Gm-Message-State: ANoB5pmX2/+gdPmpVFeGQUps8iB/2B3v/hoaOd4c4gkKaVvvk3DkTBa8 ulZukQjIurZywYUhiFP0j/I= X-Google-Smtp-Source: AA0mqf67ervCoS6zxxOBqnA+d9yv/hRYKtSARkYt5uo2l+nVw5WOIQxJJhEuLYPtyOoTOzGbn+6THQ== X-Received: by 2002:aa7:9097:0:b0:56c:674a:16f0 with SMTP id i23-20020aa79097000000b0056c674a16f0mr79510773pfa.10.1670449233450; Wed, 07 Dec 2022 13:40:33 -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 z4-20020a17090abd8400b0021828120643sm1596156pjr.45.2022.12.07.13.40.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2022 13:40:32 -0800 (PST) In-Reply-To: <87a63zyo4k.fsf@thornhill.no> 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:250218 Archived-At: > On Dec 7, 2022, at 12:06 PM, Theodor Thornhill = wrote: >=20 > Yuan Fu writes: >=20 >> Theodor Thornhill writes: >>=20 >>> Eli Zaretskii writes: >>>=20 >>>>> 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: >>>>>>>=20 >>>>>>>> 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 >>>>>>>>=20 >>>>>>>> (indent-region >>>>>>>> (treesit-node-start node) >>>>>>>> (treesit-node-end node)) >>>>>>>>=20 >>>>>>>> Which behaves similarly to c-indent-defun. >>>>>>>>=20 >>>>>>>> See attached patch. >>>>>>>=20 >>>>>>> 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. >>>>>>=20 >>>>>> 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. >>>>=20 >>>> IMO, it is better not to set the mark, indeed. >>>=20 >>> Agreed, see attached patch. What do you think, Yuan and Eli? >>>=20 >>> Should we expose the internal helper I used, or maybe this function >>> could just as well live in treesit.c? >>>=20 >>> Theo >>>=20 >>=20 >> Very nice, I applied this patch with some changes to the function. I >> think using treesit-beginning/end-of-defun is more robust. >>=20 >> Yuan >=20 > Thanks! Would you mind describing why? Yes, sorry. I=E2=80=99m planning to change treesit-beginning-of-defun = and treesit-end-of-defun so they can behave differently according to = user configuration, basically they can decide whether to skip nested = defuns or not. If we use these functions rather than re-implementing = their logic (to some extent) in c-ts-mode-indent-defun, any improvement = to defun navigation would automatically benefit c-ts-mode-indent-defun. Yuan=