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#60049: [PATCH] Add < and > to the syntax table in c++-ts-mode Date: Tue, 13 Dec 2022 22:39:36 +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="17684"; mail-complaints-to="usenet@ciao.gmane.io" To: 60049@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 13 22:41:21 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 1p5D1b-0004PG-Hr for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Dec 2022 22:41:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5D12-0001iw-QL; Tue, 13 Dec 2022 16:40:45 -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 1p5D0N-0001Tv-Fh for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 16:40: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 1p5D0N-0000cq-6Y for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 16:40:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5D0M-0001aS-JY for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 16:40:02 -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 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60049 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.16709675936087 (code B ref -1); Tue, 13 Dec 2022 21:40:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Dec 2022 21:39:53 +0000 Original-Received: from localhost ([127.0.0.1]:34795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5D0D-0001a7-6Q for submit@debbugs.gnu.org; Tue, 13 Dec 2022 16:39:53 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:40258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5D0B-0001a1-Kr for submit@debbugs.gnu.org; Tue, 13 Dec 2022 16:39:51 -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 1p5D07-0001J7-6s for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 16:39:49 -0500 Original-Received: from sonic303-21.consmr.mail.ir2.yahoo.com ([77.238.178.202]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5D04-0007jv-JN for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 16:39:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1670967580; bh=jxypFgl3t95jd+/OORMc4+NXPaswCyFaghUDw+QdITc=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=HAd8lvFIX43HYI4x6JXkqW7gr2umxZlUeogDwvKTistBQ51i0Yquwebyi6hEF8t43GJA4P0WeYr7K/HQoN1ImEUkliph53ZPtQ7qBHeg+n3SD/V9MP14zSPUbMEIHrbw7KfU1zrty7nNgzeOoJ+wi/DZtmRKdGYToAjDVNlNsyhbNThLN2r8Z85GItFDIIWLY1C13KWHpVjRWFfowaf4YAdZmYl1m5iwzdrh4rMHFhXiMJCiDykLNORPR67CWM5F82CYbJamPef3vCUCEh2d4AERPidLOwDTYiEiTYRXVauSKcpTW0yNiGeCYELmuK++1MeE5Hy9IKOgL8WyV/FMSQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670967580; bh=uEzs6uaKYMFa+sTcV2o8dg3fjcox4c+dewzcoj8zjwX=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=GDUYZB8gCzYzLetzwknXdq1OT1gHv5WDIbkZkdLUUT1+JD+Jd28rAifwXiq9b49+4N4w0K9FPdgIomU1pLyna5D7MOCN0bZ12ECZLdt2jVVPDjCK1/RA9imbZVFqSfMa42YRi70zjz2e6OLH8niZjLqIRT/NMSvR5wg7Mzf7amZSHIUQCNLWpm6mIzWuPbnn4e1iT9846//BlPDiLpdjl+Fd1fEIGbrSNa9fK6o9r9bkk4hZX6HMZ7OfMnN2jXvk/Cp7foie3jOMWoJmWeqwX1tnQJqXTSXe1Wb0h4Pn5oQVihDyq8VZOy5j52MQUP16v3rXzwULkMptonEslh404Q== X-YMail-OSG: QvwcqsUVM1n3FJUnSnOSt7lTX_JylGh1dUzK2j1HM1kmYX3VQnwxcV._LGvlJ6s TzcMZ3izbdnYeRlnSRmCk7jpK._69TnIObRzPzEE5LpEZofOhKsyNLiA88E7kcyHdxaF6erNWo6P wtlZuxxjS5C.tpsvvoFlb62WUe9AiwOQTboBkKZquEfk4_K0QmU.wzCx59GXzzlzxcxQJ.m_IbVF OmZOB1eK0BqTRzQZBYJhA4RrzD5VdCSjFpIuw4LMCxD.qSYjDtsXWwIupT61.EW4OWcBUT0ASxpM n6.aKETGf4p.fk5W59zqLiWKEPIWlucabvQk1DPO2inMiGCDlbcPYm3E_sU4U3Mg8IV3rgG2i0Cv QUHPxKNqoIJylrvHAzSfG4GWjPS7H9QoQeKHZq6XbYs70KS3yFysN60qIGUaaoGYhEMpve_1WvK6 jNSf0GDZ_gO9ZHG4d8vWSQWunZEDsx8IPBI4GUYqPjFgSY1gywrDlG9ol.ey56rCVnmnvxnw9dTr 5yi6H3hMDIrezshyeXKk7NTJje618KA4FCOcBXBuSFcvycv5K6FpKRzqygt6w401Jhuc09phyJSC nE9GZ7CYKwhBppVvOd9_OFHIv_SOz3cixWm4fBN7qh_nUoa4xhG3EZNvab_764nnFDN6.RDP9bVJ SYr2JabOrtRcVdTSOJtLHI9.5R06.yE2AwMXEFkljS5Sk0vm6wMhWNe3smJIJ.iZ1zYx16YltjKa kgvzEBM8_nayyn8opfIT.Bj6y4yGpkoPehoIJxbPYa9OBJl29Lukf0TpY7LNWSJQkdnUXCnWQQEB 7jApVp3eTre_MfbuX8RbfHmDO8WxqOdHMOiOQ67uFZ X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ir2.yahoo.com with HTTP; Tue, 13 Dec 2022 21:39:40 +0000 Original-Received: by hermes--production-ir2-5795fc58c8-hsgkz (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID cc070ef794b62b54e2931553120e6f9f; Tue, 13 Dec 2022 21:39:37 +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.178.202; envelope-from=mardani29@yahoo.es; helo=sonic303-21.consmr.mail.ir2.yahoo.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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:250896 Archived-At: --=-=-= Content-Type: text/plain Tags: patch Given the following C++ code (where "|" represents the point): |Expected getFoo(); If you press C-M-d when c++-ts-mode is enabled, point moves to: Expected getFoo(|); In c++-mode, point moves (correctly) to: Expected<|int> getFoo(); Also, show-paren-mode does not highlight any <> pairs in c++-ts-mode. My proposed fix is to create a syntax table for c++-ts-mode and add "<" and ">" to it as open/close delimiters. The attached patch implements the proposed solution. Thanks. --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Add-and-to-the-syntax-table-in-c-ts-mode.patch >From 868322dae6a881792c5601615c8d11b4181e7424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Tue, 13 Dec 2022 22:28:13 +0100 Subject: [PATCH] Add < and > to the syntax table in c++-ts-mode * lisp/progmodes/c-ts-mode.el (c++-ts-mode--syntax-table): Add a specific syntax table for C++. Consider "<" and ">" open/close delimiters (C++ templates). (c++-ts-mode): Use the new syntax table. --- lisp/progmodes/c-ts-mode.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 8407be3b6b..31c22dc321 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -83,6 +83,14 @@ c-ts-mode--syntax-table table) "Syntax table for `c-ts-mode'.") +(defvar c++-ts-mode--syntax-table + (let ((table (make-syntax-table c-ts-mode--syntax-table))) + ;; Template delimiters. + (modify-syntax-entry ?< "(" table) + (modify-syntax-entry ?> ")" table) + table) + "Syntax table for `c++-ts-mode'.") + (defun c-ts-mode--indent-styles (mode) "Indent rules supported by `c-ts-mode'. MODE is either `c' or `cpp'." @@ -615,6 +623,7 @@ c-ts-mode (define-derived-mode c++-ts-mode c-ts-base-mode "C++" "Major mode for editing C++, powered by tree-sitter." :group 'c++ + :syntax-table c++-ts-mode--syntax-table (unless (treesit-ready-p 'cpp) (error "Tree-sitter for C++ isn't available")) -- 2.34.1 --=-=-=--