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#60087: 29.0.60; c++-ts-mode conflict with electric-pair-mode Date: Thu, 15 Dec 2022 13:24:13 +0100 Message-ID: References: Reply-To: Daniel =?UTF-8?Q?Mart=C3=ADn?= Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19217"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (darwin) Cc: 60087@debbugs.gnu.org To: Eason Huang Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 15 13:25:24 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 1p5nIh-0004pH-TM for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 15 Dec 2022 13:25:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5nIO-0007hW-LV; Thu, 15 Dec 2022 07:25:04 -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 1p5nIM-0007hE-MA for bug-gnu-emacs@gnu.org; Thu, 15 Dec 2022 07:25: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 1p5nIM-000177-De for bug-gnu-emacs@gnu.org; Thu, 15 Dec 2022 07:25:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5nIL-0002zA-Tv for bug-gnu-emacs@gnu.org; Thu, 15 Dec 2022 07:25: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: Thu, 15 Dec 2022 12:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60087 X-GNU-PR-Package: emacs Original-Received: via spool by 60087-submit@debbugs.gnu.org id=B60087.167110707311458 (code B ref 60087); Thu, 15 Dec 2022 12:25:01 +0000 Original-Received: (at 60087) by debbugs.gnu.org; 15 Dec 2022 12:24:33 +0000 Original-Received: from localhost ([127.0.0.1]:42893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5nHt-0002yk-0d for submit@debbugs.gnu.org; Thu, 15 Dec 2022 07:24:33 -0500 Original-Received: from sonic309-24.consmr.mail.ir2.yahoo.com ([77.238.179.82]:40920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5nHo-0002yb-0X for 60087@debbugs.gnu.org; Thu, 15 Dec 2022 07:24:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1671107059; bh=WAdFJsWK3Q9bcjdCZ8du0a7Kb5XDU+FXhEMvF50SsA4=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=ZdU4mkWVgtHqyGw0bbIDCvZDGgEB1ZCZ9cSvnao4kV3wJIayF3CrKd7uEH9s2/AxJPmnymHKykCl0hsu4eTdDPapd/hKCg9rMLvcgrErgn1o9jec19ruC1CbDjTnHdzDJNCQNksWRjtsSOtIVJauhZTLDRvOn+VZ1LsM5GTg2TEl5QoStdy+0vVtu2vDzH9uBcDHB1fbCwOBoU0H8dfS/jNhaAmX7pvkmMIvmCIqU9gxV2RbtFQpF+MPXRgBsJJhJqSYxqFqiYoDmcUFbuItzEHzmaFlK2XQJijP0Di7nPWqWhSMEMPBdkL9nEmxyZBouYt2CI6m4N18o63M0VzVMg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1671107059; bh=0VfM4AsVTFhMUU2ZSd2oas7Y4c1KsIl/fdWPPypKzGT=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=hxZ0c5UMjlvnwQIy4xcrlNYnapBE2Yt7Wsf7gyLyxVJAYYLyO+wLY4zocjqY5GBq4iYlBJKnt2lgUsJg93q3IQC3GwWzpON17nCcuBBaM1u7npky6fbYGsRkqOEGQu5FoKxrR6aDD6AhvjeWkFs9dXDwFruMclesD4UQxDOrLF2SSaXUkedndtVaWpFVkuWiMwgQKaCA3OGbS2l+rAFf3yok7JC0aXkxr3OANu2kiSWNlKRvt0y/fSn2lzFVxJFk9X/sulKMW57SFuOoOnz7TpeyjOVOobmv1n424RfdynlIFvRw3wQ2usJ5MS6a5yUOjcQkZvMWHqzqq1zinpY9OQ== X-YMail-OSG: 2l5vyOIVM1lTC5vRY4hxDpAGJzvh_6IyCIWS0ELPSJYwQKMkak_29DOD83u2eqC FJOd1IT4GmJ1NVCfqwKKOVEJgODT2.q._plE8YPN930QnCbSBmh3X4n7bve1x15Jm.iV17QI6YIW 5VtTwvzPXD4cLtaxaiW8D8WMrDv9KPktbM207aFosmw8fTySfkmCboE3cts3_TdfJnyaAlkNHbzR 9gmntlwMtrpXCvq2m5xE.pcD14IurDDfUSxHVHkjGN9MFE1Q8.ZrkHMq901IKbp2AOr7l9n1wTU9 gBBal9a2UusVS4L.hW8jBpQehkp3Tzi948nAnwO3eVlbntZPl7VqCSeMDOYklVIsRVUcqcIDPEhk 5_CC6kDs96v_90fR.FIX3yJaEwUX3PAaOhY2.QQthm.dJg0tWpG696uORfBmRSrkOVtlZ97Np7pi XGhxNy3MeRXQPmK6qLJzHkDxVhJ8zdmHFpNX4e2uhXfqJecNqu7Oac14ACdq2dYso6WZs15MFM4m vRcgehDVHgHhgxh6lOz96aV1rUTTW6NaML1wDu06xbbdXuRcu2XqplEv8El7AgjUG6I8KNSJfwK5 HATDFkS5hzWvpe8N8ncjJp._ctm7d8pwak8WMTkx3zP2kf5zAqg18wBuRozy5Y2A5hjqg5DAb3XF zoYNiawq5ZOqTSwO32gnJgosCcwme0VPIHSVagyXJRVlP8awxn7v2J_ykS50vpjefgBVAaoX49dd QxOu7yuYSVNCXPmtbrUBW3_hgQiDr1R2R8F615JKndc_iVsRzmVwgC3Ju0CLpNdcmowfL12xDvGb 38AYSquAO6Q7nosIkTd045958ataMGmbYQ5HTO_Lfy X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.ir2.yahoo.com with HTTP; Thu, 15 Dec 2022 12:24:19 +0000 Original-Received: by hermes--production-ir2-5795fc58c8-hz8w8 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID ab5cbcb4db1b8ec4ce2182aaec0ac2c2; Thu, 15 Dec 2022 12:24:15 +0000 (UTC) In-Reply-To: (Eason Huang's message of "Thu, 15 Dec 2022 19:17:19 +0800") X-Mailer: WebService/1.1.20982 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:251077 Archived-At: Eason Huang writes: > Hello Emacs dev team, > > I found that the c++-ts-mode conflict with electric-pair-mode. > My build is based on commit a15cd55044c6bb4d4e9f9aec23b8b5b9cbcb38ac > > May be the issue was introduced by this commit: > https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-29&id=480f41c7deb4d3a45a862a5308950b35085f835d > > I can confirm that Before the commit 480f41c7, It work well. > > steps to reproduce: > > 1. emacs -Q, start Emacs > 2. C-x, C-f ~/test.cpp, open any cpp file. > 3. M-x c++-ts-mode, enable c++ tree-sitter support > 4. M-x electric-pair-mode, enable electric-pair-mode > 4. Type the following code in the test.cpp buffer. > ``` > #include < > ``` > you will the the result as below: > ``` > #include << > ``` > > expected result is: > ``` > #include <> > ``` > Thanks for the report. I think the bug is that we need a second character in the syntax table entry, to set the correct matching delimiter. Does the following patch solve this issue and bug#60049? diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index ff2ff63fd8..11b2b9408c 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -86,8 +86,8 @@ c-ts-mode--syntax-table (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) + (modify-syntax-entry ?< "(>" table) + (modify-syntax-entry ?> ")<" table) table) "Syntax table for `c++-ts-mode'.")