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 19:32:33 +0100 Message-ID: <87359x8xmm.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> <875yet975l.fsf@thornhill.no> <834judg67m.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="31954"; 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 19:33:27 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 1p1Aqk-000872-8U for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 02 Dec 2022 19:33:26 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1AqY-0004f8-J9; Fri, 02 Dec 2022 13:33:14 -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 1p1AqN-0004e0-Gi for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 13:33:11 -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 1p1AqN-0001Jc-5I for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 13:33:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1AqM-0008L4-Ia for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 13:33: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 18:33: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.167000596132047 (code B ref 59662); Fri, 02 Dec 2022 18:33:02 +0000 Original-Received: (at 59662) by debbugs.gnu.org; 2 Dec 2022 18:32:41 +0000 Original-Received: from localhost ([127.0.0.1]:48158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1Aq1-0008Kp-0r for submit@debbugs.gnu.org; Fri, 02 Dec 2022 13:32:41 -0500 Original-Received: from out-216.mta0.migadu.com ([91.218.175.216]:65456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1Apy-0008Kj-1W for 59662@debbugs.gnu.org; Fri, 02 Dec 2022 13:32:39 -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=1670005956; 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=uvotQeaTTen6wnJiWwpVQsl3jPcSWQNOQTsHmg7i4GQ=; b=y7Bc5BiKW451glfTCVeK1G2p9wp7wQ2XtS0LPbLjCBweT1HBp34n+0LRcGoK7Xdyv3QpYK OqFwZKHW4sPCJvAwP+LR/oiO+Hw1GtO5kQzzmWR/799r7JYgntT+xe4AJF0nD1q+AtuVcN s7Mm50DelWCO1SMFyJhgTkrDTK0CLhDfgMHx2YDxrWV5rmr9zYj47UAyyyKGgghQzMrbud 6Yw3vFcvXf48Yv/Tkq8qN+o9x4WnYFyrR8/xpP8wJ9ETeVz5CST7zTJaOJpn5Sy0QtCJXQ 0r7sibZznBfHhZTddvcgfvcU4+QBNxOlV7FGHacbNrfmVsENUUmT35dW7jv+Qg== In-Reply-To: <834judg67m.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:249771 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Theodor Thornhill >> Cc: casouri@gmail.com, 59662@debbugs.gnu.org >> Date: Fri, 02 Dec 2022 16:06:46 +0100 >> >> > 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? > > Yes, thanks. > > But a command should not have "--" in its name, since every command is by > definition a public function, not an internal one. That makes sense. I was in doubt about that, but decided to go the (wrong) direction. Updated in latest patch. However - mark-defun signals an error on some constructs because of number-or-marker error: Debugger entered--Lisp error: (wrong-type-argument integer-or-marker-p nil) treesit-end-of-defun() c-ts-mode--end-of-defun() end-of-defun() mark-defun(1 nil) mark-defun(1 23209) funcall-interactively(mark-defun 1 23209) call-interactively(mark-defun record nil) command-execute(mark-defun record) execute-extended-command(nil "mark-defun" nil) funcall-interactively(execute-extended-command nil "mark-defun" nil) call-interactively(execute-extended-command nil nil) command-execute(execute-extended-command) I'll file a separate bug report for this one, if that's ok? Yuan, are you ok with this patch? Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-c-ts-mode-indent-defun.patch >From b7c82cf11404a68338aa495cbd4424f45e1f8405 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..36d67c5701 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 --=-=-=--