From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel =?UTF-8?Q?Mart=C3=ADn?= via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#60047: [PATCH] Treat C++ classes as defuns in C Tree-sitter mode Date: Tue, 13 Dec 2022 21:44:28 +0100 Message-ID: References: Reply-To: Daniel =?UTF-8?Q?Mart=C3=ADn?= 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="20526"; mail-complaints-to="usenet@ciao.gmane.io" To: 60047@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 13 21:45:28 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 1p5C9Y-00059O-0U for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Dec 2022 21:45:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5C9B-0000mf-Ho; Tue, 13 Dec 2022 15:45:05 -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 1p5C98-0000mB-Fg for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 15:45:02 -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 1p5C98-00040E-5j for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 15:45:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5C97-0007GU-Jz for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 15:45:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Dec 2022 20:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60047 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.167096428327901 (code B ref -1); Tue, 13 Dec 2022 20:45:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Dec 2022 20:44:43 +0000 Original-Received: from localhost ([127.0.0.1]:34550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5C8p-0007Fx-68 for submit@debbugs.gnu.org; Tue, 13 Dec 2022 15:44:43 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:44652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5C8o-0007Fr-6w for submit@debbugs.gnu.org; Tue, 13 Dec 2022 15:44:42 -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 1p5C8m-0000Z1-6Z for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 15:44:41 -0500 Original-Received: from sonic305-21.consmr.mail.ir2.yahoo.com ([77.238.177.83]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5C8i-0003y4-KG for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 15:44:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1670964272; bh=D+vBkhcReoAyhXa4YpSFiNor/0dICpi02Mf9+HpV0as=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=WJBSlZITGRboM7FdMZKIFgfQW3Fm96Ds4EiKbbsUFQEZg+I810RPS2lF680jBZB8tW3kmrSVk4LVM2fNmsLMmglA6E5zidLKmvtmcmYmEeaPgLytK260g8R11VCXzwLixUPdKFTWu8q8flRkqO+TrUMy/lmkELiPNTKrWIHdKVtCoKb3M6OgSPevdZLg2jSa5NXrqt55PWjfNM6s37jIpr7yYwfwtRCWjKQaSI0ceNlZP6q+KJxtFqeZ2OpTB00rMAXVlE5FiBuoPIhgxA+yZmUGjZuVJFRbaclIt+vSOpw76/Uxk15nWwDn7i6c/zwA8Tn8ckCrPxfn9+XElXWllw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670964272; bh=1Hgd0RCBhVZM8SvEjPhnbeNfSOjyAYhtPEyYSWyzX4p=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=KecfuGXrwg26WDzdKNwAlGWmu65mLKJHKpk9y0XX80dBR2VyqdCrsNXFqJ9lthdmU5q6uPZelLZ4cc/mZEoLrM4NFOU8bUgBhX0fuahNia40LGmKpkbsj8fiMdQiLeMYBuJ6ODIXQW7pt2R9EPVMpo0hloutF00jqstiz9e6rGAGe0eRDbNrMLIjeCUyzkbx0H9MmU48xf6X+SoCXczMKVVaZmwk2rc6Zo3ZRvsismV4XYyXxLkP/Gya/TfsKTuN9DOrt6Eg1t4NLtaxtFl5EGP3lA3NVYbgnr3XIwLgIQNneMSARHUu4ILr3GXzUK0Ca9ha9K9OwTrQkClXPX8THw== X-YMail-OSG: 43zAO4YVM1lYitZXtREuyJtVK1PzFsoS26B0iVI4axkUHQJ8LeFeCXNDkTgHJlO qXWEUqCQiaRIQSJzc5gidEPAhGARWDfyOghSoQyYCuPTUdGeA.xbXpstZk8qKrd_uCiCBTD7_sCb AXoO8EmipKthGf5C.7aHeb2do1BKyitGLmtVSG6ux6I.y0p5QEIZtNy5GIU9p0qjAXX9Du.k3V8j Mt4J5pimiAuG6vyKOGXan.NwG6CHXhmhkMzs3TV9odO8Xs4h9tCAnSpk900KOp0BZlIQbcB6H8Oc MrAonGJGmMJ.hKINUv4BFdF7oVzzK6hucdyQwh2q2c1rcyWy.6.p9WdTw_J6_rmkB3EXZZfziyjk RTD41f4yvyKUyd2.ba_pjJ6.BbVYlpF_rfS6Lv8wihHFZZm7R2lFyDgfUEEaLEU7d7jYCRrdlKbd qX3BkvmHicM.yApO0ckXNTbTXvjlrqhJvJA2URuzaNYWDkBMWXqX1NetsO.cO0XR8EwVjGqjwoXD qUDGcpDYfZieOaVLWfpZt3Yp5uxN6al.YXGwA1pII8zCRm236GrFieK6BhnIe_w7tzKP2kVWq2yy DoOkeB5mJeSnLeY9hDe9kIE9HRefLM76qZs5.QfxTEOfFmb8R7Kiqel.40FcfIkQ6qu3Bt.U0may tpiswuINBoljWGHczZjxfbZhcxTbJZ7o0OKqD_LuX88rgoOkQZTxop2YJWn6xiigvh2x9qFN5Bhj cgC.qV5Rio73b0zWLNMYF.RfwEwmfU_1_WZkMzjsA_gODQgmY622L5gNB8SrEphqNyDqwsr7qD.u IZloWqzp9GB9_e9b2W9HBIvIfQFol_VROnEqoDzS.4 X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.ir2.yahoo.com with HTTP; Tue, 13 Dec 2022 20:44:32 +0000 Original-Received: by hermes--production-ir2-5795fc58c8-kh698 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID b142cd5de79f8a7c6e5f368e096a628d; Tue, 13 Dec 2022 20:44:29 +0000 (UTC) X-Mailer: WebService/1.1.20926 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=77.238.177.83; envelope-from=mardani29@yahoo.es; helo=sonic305-21.consmr.mail.ir2.yahoo.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:250892 Archived-At: --=-=-= Content-Type: text/plain Tags: patch The attached patch makes C-M-a/C-M-e inside a C++ class definition in c++-ts-mode go to the beginning or the end of the class, respectively. I've added it to the base mode because I think it's harmless for C, and it can be convenient if we implement an Obj-C mode based on Tree-sitter. Thanks. --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Treat-C-classes-as-defuns-in-C-Tree-sitter-mode.patch >From 008ce6794281fd606df8161af5ed65b267be0664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Tue, 13 Dec 2022 21:35:40 +0100 Subject: [PATCH] Treat C++ classes as defuns in C Tree-sitter mode * lisp/progmodes/c-ts-mode.el (c-ts-base-mode): Add "class_specifier" as a node of type "defun". --- lisp/progmodes/c-ts-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 0d0a14e933..8407be3b6b 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -553,7 +553,8 @@ c-ts-base-mode "type_definition" "struct_specifier" "enum_specifier" - "union_specifier"))) + "union_specifier" + "class_specifier"))) ;; Nodes like struct/enum/union_specifier can appear in ;; function_definitions, so we need to find the top-level node. -- 2.34.1 --=-=-=--