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: Fri, 02 Dec 2022 16:06:46 +0100 Message-ID: <875yet975l.fsf@thornhill.no> References: <5B538888-E454-4F75-B3B8-AB20E10B3E89@gmail.com> <83o7sniokt.fsf@gnu.org> <56840149-5EB9-4C22-841F-45F410BFC885@thornhill.no> <83edtjimyo.fsf@gnu.org> 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="9255"; mail-complaints-to="usenet@ciao.gmane.io" Cc: casouri@gmail.com, 59662@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 02 16:07:19 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 1p17dG-0002AC-JP for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 02 Dec 2022 16:07:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p17d8-0008Sz-Oz; Fri, 02 Dec 2022 10:07: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 1p17d0-0008RY-W1 for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 10:07:03 -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 1p17d0-0004Q9-Lk for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 10:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p17d0-0006Rm-HG for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 10:07:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Dec 2022 15:07: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.166999361324764 (code B ref 59662); Fri, 02 Dec 2022 15:07:02 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 2 Dec 2022 15:06:53 +0000 Original-Received: from localhost ([127.0.0.1]:47236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p17cq-0006RM-RH for submit@debbugs.gnu.org; Fri, 02 Dec 2022 10:06:53 -0500 Original-Received: from out2.migadu.com ([188.165.223.204]:49703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p17co-0006RG-7O for 59662@debbugs.gnu.org; Fri, 02 Dec 2022 10:06:51 -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=1669993607; 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=YnYuyhIQPEyfAWqw7kLGFmb/MUtCZnrBaQxlhiQWaxI=; b=bKUJT/0bkBqo9a+r6lkNe7H3fQQnXnUSSUGXdXy2mn5S7PqibGlhGoOmN+35d6r3+GSykq V2K34RfVomx0s3JIv7WqgTKPTS33DdCnervA0bgnBhJ/U3kthdQxuQKkadRlmR3mWTzpl3 dscDiIz+IcgexM8m8YwBGbKfUJa0OYGrOwiU84TVsOb8EvgW354ne8tDpkuXWLl1ccQrqY 6x1Svg9+mH1qmmH5UcrOcHXxfy807ojOqk8p2JH5vtnyRVQAyc9JznRpqkXGEzqJ3gUNtp WxsHAH7MqAm6A/SqLZEGEk/Q8bCQMxawHlzzpDbeCem8BmC+wkoCkOkf+/PROw== In-Reply-To: <83edtjimyo.fsf@gnu.org> 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:249758 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> Date: Thu, 01 Dec 2022 08:22:45 +0100 >> From: Theodor Thornhill >> CC: 59662@debbugs.gnu.org, casouri@gmail.org >> >> >SGTM, but I'd begin by doing this only in c-ts-mode.el (and maybe also in >> >csharp-ts-mode). After all, until now this functionality and the "C-c C-q" >> >binding was only in CC Mode. (My original question about this was due to >> >lack of enthusiasm to add the "C Indent" node of the Emacs manual text that >> >explains this feature is only available in CC Mode, not in the tree-sitter >> >based C/C++ modes.) >> >> So you'd like the change in lisp.el, but bound only in the modes you mention, or have something similar to the original patch in treesit, but still bound only to the same modes? > > Why in lisp.el? we are talking about a feature of C-like languages. The > current binding of "C-c C-q" is in cc-cmds.el, so what I had in mind is to > have its counterpart in c-ts-mode.el. Something like this? Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-c-ts-mode-indent-defun.patch >From 26a8780950017a911bac7290366da05e0e35f13f Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Fri, 2 Dec 2022 16:05:35 +0100 Subject: [PATCH] Add c-ts-mode--indent-defun Add in this function to mimic 'c-indent-defun' * lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-defun): New function. (c-ts-mode-map): New mode map that uses said function. --- lisp/progmodes/c-ts-mode.el | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index fcabb5beac..3171600901 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -518,9 +518,25 @@ c-ts-mode--end-of-defun (if (looking-at "\\s<\\|\n") (forward-line 1))))) +(defun c-ts-mode--indent-defun () + "Indent the current top-level declaration syntactically. + +`treesit-defun-type-regexp' defines what constructs to indent." + (interactive) + (save-excursion + (mark-defun) + (indent-region (region-beginning) (region-end)))) + +(defvar-keymap c-ts-mode-map + :doc "Keymap for the C language with tree-sitter" + :parent prog-mode-map + "C-c C-q" #'c-ts-mode--indent-defun) + ;;;###autoload (define-derived-mode c-ts-base-mode prog-mode "C" - "Major mode for editing C, powered by tree-sitter." + "Major mode for editing C, powered by tree-sitter. + +\\{c-ts-mode-map}" :syntax-table c-ts-mode--syntax-table ;; Navigation. -- 2.34.1 --=-=-=--