From unknown Sun Jun 15 08:48:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60441: [PATCH] Fontification of function declarators with reference return types is incorrect in c++-ts-mode Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 31 Dec 2022 00:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60441 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 60441@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16724478771523 (code B ref -1); Sat, 31 Dec 2022 00:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2022 00:51:17 +0000 Received: from localhost ([127.0.0.1]:36293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBQ5l-0000OV-9Q for submit@debbugs.gnu.org; Fri, 30 Dec 2022 19:51:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:53816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBQ5j-0000OM-2o for submit@debbugs.gnu.org; Fri, 30 Dec 2022 19:51:15 -0500 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 1pBQ5i-00015z-QU for bug-gnu-emacs@gnu.org; Fri, 30 Dec 2022 19:51:14 -0500 Received: from sonic306-21.consmr.mail.ir2.yahoo.com ([77.238.176.207]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBQ5g-00059Q-RH for bug-gnu-emacs@gnu.org; Fri, 30 Dec 2022 19:51:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1672447866; bh=9XMfM5H+FpqpLVTBkBmKXppGzcpVi8p6KBI7kKLTxKY=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=sNX8WMNJE2D4uGGe4LmTI7qUkTIwDZ0hRKS+sdPHROVYevL0YFnyoeKR2n4NJntYLnNazj97SBAJp7sMBEG9ykuo6htEC8xbBFr9RKZqvDtHX0ZhwNHN1GBznZvewHyWQkLgxt6OEktprQ0L2qzahqdvKbWmcKFCiYA76gv8KsqzuKNJJ4/BbZpl6gBB/oxV7aeRPxb809nofaP3WxuyUjE0rYraPNBcyRzzc4jIc5Hq/iOhvEGMQFW1lOpfWZr5aKMT743B/nmeLnQOzWYFKvMSsKxnBNK3OwftSwm3HOvKZseShpZYfS05eF4gGM/hCJkElN0Wqag8nwZ9+Q2Yow== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1672447866; bh=iKBgLENIbST0qZGS9xZmeEAT0fH6Kqz6POvPE8ap10G=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=DdECgtMmncA6wKQ8XkxV7XZpdoZ0faBQ8LUFU1FIKXJl9qylBXKe8eKNGzK5GKS4wmcfdT6yJQMEnr25hte2ern+JTJidXHymt8Aj0OIbK0VPnrEBCY8U16GWVUhKJjD1CEoTcJ0VBvQaS8vCK3sdV5hGBD0Z5ZLZ3IA8WmkJM5tWW+Kml1ZMf/7tK0ftx7WQ/7PpY45Gz0tQzM8nEQDp/gIeGpVF5Pi74jYYHL817BE99pON6C0PLcCed0i9ebsG2kbA05cFD5IL1KfxA8PryzgN99TQUKcQh8uSKqDw4SdRwyS1zsa9zH0PXeKV2gzitFYaHA8NcuVIbGvgx18QQ== X-YMail-OSG: rZp7T30VM1mHEH.2yVNjo0GWZ3.5Fmcu.WTPrN4ixkVE6V_pNgjWq7hh_7u3H2. nlEwO.CWuNP.s8koD_WuKp.qqXq2LEC45MNAgfbqmgq7sfldbAHdPOPRCka9PLyzCTf6fff3BP.t DHDdMlER0RPFG9_Z0X5OypSqTLbvqKbxnBcUzvRyNYwnO1SVkzDrGkD6f5GUjERxpj7zbtdQACwi DG8w92lV14D8Uto5XTcftHZnGj8961iMUIaJrTPboGLB2UAQLKJfRcsdy6OaxLl8O16CdRDXEyOK wO3Ip1xzT6WBxclF6sbHgKt5.2EsQvr.ddfSN0quY_ZluTnDBpUBr_ya.TJZfVOkC8djlg1BR8xQ yl1NmoaRPHyL4lhzRISLD1gR1HsUncPk.Mn_sjrET2V_Oa.k5K0ab.VQWlUXj.btbCiQvnTjCAys 6scU7W3Kl_n_uwWTQGTBERd1S.SsbGhI_iVqKO9sCD81bAwODuFfYDNSJxMmVc5nBS8ER1ZKv59d BatOGjp6zbNOPHRmBT8kw.kpI8NzObW.mTDENloKOye.O7DMn66kay2hMFhlvW85B6n8q1tkea7b aR0rVJALBBTF4IMfZon.K2OxZTEGSaQJOoDhxkbFMlUglaitUPi0wvRW5YQlyLKWW6xHKFhSfuVg b62Rw_HS4lMbWp8L6MKALIhJCiznN5xC93.AaZ3OGMMHeTzwtdvyHM57AXGjEgxHwE_QqJRQFDVk xwSkGJE7vEln9.g9LgcsD7rlniA.E3yC2_GINY_98FcFlZ5.FQBpjQqzyz_Et1q2zxRJc57t7Ijl VaKnrFo5JfVWRYKOHvBx70QlPS76epjsXQqQatWfoklHIEDzBUpRwLubM8cjnw9B2Oo3VVMlQ7p1 EvpaVMQY0RmdJgZcD8n.5SQwYdgGCSkl6H784TOQf9cmhq3Qb_nzTImpmUcY.sMcJ1sQ759X5Evk JKSNMg4iqKGL8nC9Vrc_iAQXnq5SGyi_8Yqh0D7yeWShCpPc.WdWLxwcSVtomMLlAB_GkAZa3M7g 8IMnjPWwbzSUwVewaz2ANBG4bwQT4YW0nKCdQBbjRVIpSQW7wLUPmo.xCaUXXnR5_Hw7kDG3mKjR in0VeL3RhbgGZDEZlY8P.LwDZ4ZZeiNoxIa4gEYC9b4mNNzQHZ8ew5R2eTL_88iKKtK9.RsV7kwv ocZBVQwJnmnxfZtfFNTuyJodLO2zhowE7mkEoI5HWncI1SoanConrR8fuCvoDWaFnLkazoOYDkKL 8Iq42Gw6kdrB1tCoCFwZ5JE3_OGdyElT5HfwxFJnnQF6iWuTBZ63fLkYuKbfHqlXCpwWjBoIXCkP sCItwzoufWIVQzxID7mJygAUXSwsCknrFNZ4JdxafB0a6jDDZCMrPT6kNzTl8PuZhut436u.ITgU NXOVEnceqo4vqn97kg46ZdgUZVKEcpV6wlAOyGt3ZV4ipSvHOm9nbit6QJ_qVMIj_UF3EMdjVcO2 NPZJLifhAA4yAoC_LvagzqO4aBM6DKLidE7KuM16OKFDy3IEwgTgNAn4I2j7kBlm.WhrRpB8Gbnt kMgqwwpw8WYgk.UwoesikaA5sfCgcSuQDc.f0Rtzue.BPOluTMdEOXJnVngo9FlXZfYtsB7a6.IS bBBrI70N4v_HINwCVTu.K1hllEfs_QgFxVJlKJlhmsfj0AE7uHcMoF88NmKFGjX8U_Otsjv48VPO IhXFVizFkAMMl7lExML6YmtJaNBQj4uEj.NPNldW.0GEtQvFrGxvtSh6WUZiSabkgdsKcrGKmbgV Bh32mLZcKO3kyHxQLB95eBjht3MNf4QHy0ijrvb_EZeLtgmjVVFUA1qfoXw.aO3iFckQiJIeRhfX i5i9IiE9jum2GVWoXWlroV5e66fvLV52EefQjRbvA7zmeUiLGsVfwgDBpPdA8aXYapvvsX01uXvB sqt0j_RPpv_zDti724Q4THrP3TF3VHZ2GjC1aKzBvijhqvIWoKRxIYK0hW0CQyrOtdkUgQb363Ry LCnyrpEdEZaOZxRXj6qdeSaYb2BqQZOHo7DnOxC0AEkuiZoEB_fH7eK6TCaWVVSS.shKuMDJfuSR c_TtWTzPmFUh7qddeTXWOVjm8sSMkzKoiKdgOqn1e4HkzDU1LsZVsuogE7dM2GaBpDhCFtW9aMKg c3dcJqx8P0fTix6rnrgyqTbUFoDbP5fL.TgD2cFl.SinD3Yo6Wf7Y2r5KJuNpBsF.91vqhAinRaN ChG4wBGVXwkOWOJ2KBAapIg-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ir2.yahoo.com with HTTP; Sat, 31 Dec 2022 00:51:06 +0000 Received: by hermes--production-ir2-5795fc58c8-g4k29 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 5cb3f743c7fd9e307154a84f6a660d52; Sat, 31 Dec 2022 00:51:03 +0000 (UTC) From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Date: Sat, 31 Dec 2022 01:51:02 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" References: X-Mailer: WebService/1.1.20982 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Content-Length: 1636 Received-SPF: pass client-ip=77.238.176.207; envelope-from=mardani29@yahoo.es; helo=sonic306-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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Given the following valid C++ code: class Foo { public: Bar& getBar(); }; c++-ts-mode does not fontify getBar with the font-lock-function-name-face face. I've attached a fix to treat reference declarators in c-ts-mode--declarator-identifier similarly to pointer_declarators. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-fontification-of-C-functions-with-reference-retu.patch >From 19182746e53ca66dc94aea4a7cd91f67cc7e0aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sat, 31 Dec 2022 01:45:27 +0100 Subject: [PATCH] Fix fontification of C++ functions with reference return types * lisp/progmodes/c-ts-mode.el (c-ts-fontify-error): Treat reference_declarator nodes the same as pointer_declarator nodes when calculating the identifier to fontify. --- lisp/progmodes/c-ts-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 82a13e9762..3cb671f4c5 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -425,7 +425,7 @@ c-ts-mode--declarator-identifier ;; Recurse. ((or "attributed_declarator" "parenthesized_declarator") (c-ts-mode--declarator-identifier (treesit-node-child node 0 t))) - ("pointer_declarator" + ((or "pointer_declarator" "reference_declarator") (c-ts-mode--declarator-identifier (treesit-node-child node -1))) ((or "function_declarator" "array_declarator" "init_declarator") (c-ts-mode--declarator-identifier -- 2.34.1 --=-=-=-- From unknown Sun Jun 15 08:48:31 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Daniel =?UTF-8?Q?Mart=C3=ADn?= Subject: bug#60441: closed (Re: bug#60441: [PATCH] Fontification of function declarators with reference return types is incorrect in c++-ts-mode) Message-ID: References: <462D9A99-5D8D-4AD5-97C3-017389635E22@gmail.com> X-Gnu-PR-Message: they-closed 60441 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 60441@debbugs.gnu.org Date: Mon, 02 Jan 2023 00:27:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1672619221-25817-1" This is a multi-part message in MIME format... ------------=_1672619221-25817-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60441: [PATCH] Fontification of function declarators with reference return= types is incorrect in c++-ts-mode which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60441@debbugs.gnu.org. --=20 60441: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60441 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1672619221-25817-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60441-done) by debbugs.gnu.org; 2 Jan 2023 00:26:23 +0000 Received: from localhost ([127.0.0.1]:42029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8el-0006hO-GB for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:26:23 -0500 Received: from mail-pf1-f177.google.com ([209.85.210.177]:40678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8ej-0006h8-Fy for 60441-done@debbugs.gnu.org; Sun, 01 Jan 2023 19:26:22 -0500 Received: by mail-pf1-f177.google.com with SMTP id 18so5601453pfx.7 for <60441-done@debbugs.gnu.org>; Sun, 01 Jan 2023 16:26:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=bL9cIpn1JoJsXzh/IQosbYGk/5NJkQsbVpVyw2ipmR8=; b=IYDDapM8YaBbpx8I49v/76VTMRS68HPVsOY1KU5/m3QaTxdOUxJcAmytK2OoA/bbCM m6VGXllt2Nkk9tn9lQl8lAxXVvrgl2RV6bTGAAu5Y8wYVoUaExdSJ/HrxNX+I1fx5rsi Co1aWdqO7J2YnAbJPTstp5Q6bhEpueHPlNraNjUKRpmOmuxOBGwftbZb0aQw9z4z0Ig0 IxXV2hRnWgwGfvZgBj8Jgd6XA4jnNC1GOy/UZBjQ8Xyo2+NG3nVctPIn+IfJIMrt8cUC B82sUNwPhrtuj6t/gAg3LV2aqNnHp7E1QGwNW/A8LbmXBpVMlRu4NNvXnnRRSI1dT7rj MODQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bL9cIpn1JoJsXzh/IQosbYGk/5NJkQsbVpVyw2ipmR8=; b=UWgRBb0LLMl8q2nZLnEaBlpaKTFLX42G6057e/cr6Ac4CTgL7Ti+DJ7EP5DEBxeQMr zzj+9xLcwSPK3d13iaFP9KAvJOY04oEi3izMhi1jMhM+8JcZ6vKIC/OPOaYKMVdcAONO 2M6VpRpwaRGCkjt4vPXn1j0rSehTX0Jhq3pvrr3R8OwKSocfUsMY40PLcRsp2ezhW8MK d3Df5j2DrAOqmWUahTy0Y1lb80hmkG/kh/Ld67eTRuXi2wLzUVMlhjYFnPxeNavivBJy aj9CiSWOnYO4pBP4AKDmId04jRMmHIt39/EDce+lnIi5P+8sDK+hIepGtADlPTeekSNi +cPA== X-Gm-Message-State: AFqh2koRMLwvEn0WMNm7Aiat8ikkDnMbY38xXWcFtFn1zgdnCWprqcTW F5NTufhLkJqJ767HcsSG/sE= X-Google-Smtp-Source: AMrXdXuztu2kLiLjWnbryhXN5h1cZ7WsPCa4BSlMIK4FI3t3IZaBo9bFnq054y5g1WbIyoZ9bxwEuA== X-Received: by 2002:aa7:9f90:0:b0:578:795e:c8d3 with SMTP id z16-20020aa79f90000000b00578795ec8d3mr42735419pfr.29.1672619175790; Sun, 01 Jan 2023 16:26:15 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id 13-20020a62180d000000b0057737e403d9sm17081476pfy.209.2023.01.01.16.26.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Jan 2023 16:26:15 -0800 (PST) From: Yuan Fu Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: bug#60441: [PATCH] Fontification of function declarators with reference return types is incorrect in c++-ts-mode Message-Id: <462D9A99-5D8D-4AD5-97C3-017389635E22@gmail.com> Date: Sun, 1 Jan 2023 16:26:14 -0800 To: =?utf-8?Q?Daniel_Mart=C3=ADn?= X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60441-done Cc: 60441-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Daniel Mart=C3=ADn writes: > Given the following valid C++ code: > > class Foo { > public: > Bar& getBar(); > }; > > c++-ts-mode does not fontify getBar with the > font-lock-function-name-face face. > > I've attached a fix to treat reference declarators in > c-ts-mode--declarator-identifier similarly to pointer_declarators. Applied, thanks! Yuan ------------=_1672619221-25817-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 31 Dec 2022 00:51:17 +0000 Received: from localhost ([127.0.0.1]:36293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBQ5l-0000OV-9Q for submit@debbugs.gnu.org; Fri, 30 Dec 2022 19:51:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:53816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBQ5j-0000OM-2o for submit@debbugs.gnu.org; Fri, 30 Dec 2022 19:51:15 -0500 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 1pBQ5i-00015z-QU for bug-gnu-emacs@gnu.org; Fri, 30 Dec 2022 19:51:14 -0500 Received: from sonic306-21.consmr.mail.ir2.yahoo.com ([77.238.176.207]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBQ5g-00059Q-RH for bug-gnu-emacs@gnu.org; Fri, 30 Dec 2022 19:51:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1672447866; bh=9XMfM5H+FpqpLVTBkBmKXppGzcpVi8p6KBI7kKLTxKY=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=sNX8WMNJE2D4uGGe4LmTI7qUkTIwDZ0hRKS+sdPHROVYevL0YFnyoeKR2n4NJntYLnNazj97SBAJp7sMBEG9ykuo6htEC8xbBFr9RKZqvDtHX0ZhwNHN1GBznZvewHyWQkLgxt6OEktprQ0L2qzahqdvKbWmcKFCiYA76gv8KsqzuKNJJ4/BbZpl6gBB/oxV7aeRPxb809nofaP3WxuyUjE0rYraPNBcyRzzc4jIc5Hq/iOhvEGMQFW1lOpfWZr5aKMT743B/nmeLnQOzWYFKvMSsKxnBNK3OwftSwm3HOvKZseShpZYfS05eF4gGM/hCJkElN0Wqag8nwZ9+Q2Yow== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1672447866; bh=iKBgLENIbST0qZGS9xZmeEAT0fH6Kqz6POvPE8ap10G=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=DdECgtMmncA6wKQ8XkxV7XZpdoZ0faBQ8LUFU1FIKXJl9qylBXKe8eKNGzK5GKS4wmcfdT6yJQMEnr25hte2ern+JTJidXHymt8Aj0OIbK0VPnrEBCY8U16GWVUhKJjD1CEoTcJ0VBvQaS8vCK3sdV5hGBD0Z5ZLZ3IA8WmkJM5tWW+Kml1ZMf/7tK0ftx7WQ/7PpY45Gz0tQzM8nEQDp/gIeGpVF5Pi74jYYHL817BE99pON6C0PLcCed0i9ebsG2kbA05cFD5IL1KfxA8PryzgN99TQUKcQh8uSKqDw4SdRwyS1zsa9zH0PXeKV2gzitFYaHA8NcuVIbGvgx18QQ== X-YMail-OSG: rZp7T30VM1mHEH.2yVNjo0GWZ3.5Fmcu.WTPrN4ixkVE6V_pNgjWq7hh_7u3H2. nlEwO.CWuNP.s8koD_WuKp.qqXq2LEC45MNAgfbqmgq7sfldbAHdPOPRCka9PLyzCTf6fff3BP.t DHDdMlER0RPFG9_Z0X5OypSqTLbvqKbxnBcUzvRyNYwnO1SVkzDrGkD6f5GUjERxpj7zbtdQACwi DG8w92lV14D8Uto5XTcftHZnGj8961iMUIaJrTPboGLB2UAQLKJfRcsdy6OaxLl8O16CdRDXEyOK wO3Ip1xzT6WBxclF6sbHgKt5.2EsQvr.ddfSN0quY_ZluTnDBpUBr_ya.TJZfVOkC8djlg1BR8xQ yl1NmoaRPHyL4lhzRISLD1gR1HsUncPk.Mn_sjrET2V_Oa.k5K0ab.VQWlUXj.btbCiQvnTjCAys 6scU7W3Kl_n_uwWTQGTBERd1S.SsbGhI_iVqKO9sCD81bAwODuFfYDNSJxMmVc5nBS8ER1ZKv59d BatOGjp6zbNOPHRmBT8kw.kpI8NzObW.mTDENloKOye.O7DMn66kay2hMFhlvW85B6n8q1tkea7b aR0rVJALBBTF4IMfZon.K2OxZTEGSaQJOoDhxkbFMlUglaitUPi0wvRW5YQlyLKWW6xHKFhSfuVg b62Rw_HS4lMbWp8L6MKALIhJCiznN5xC93.AaZ3OGMMHeTzwtdvyHM57AXGjEgxHwE_QqJRQFDVk xwSkGJE7vEln9.g9LgcsD7rlniA.E3yC2_GINY_98FcFlZ5.FQBpjQqzyz_Et1q2zxRJc57t7Ijl VaKnrFo5JfVWRYKOHvBx70QlPS76epjsXQqQatWfoklHIEDzBUpRwLubM8cjnw9B2Oo3VVMlQ7p1 EvpaVMQY0RmdJgZcD8n.5SQwYdgGCSkl6H784TOQf9cmhq3Qb_nzTImpmUcY.sMcJ1sQ759X5Evk JKSNMg4iqKGL8nC9Vrc_iAQXnq5SGyi_8Yqh0D7yeWShCpPc.WdWLxwcSVtomMLlAB_GkAZa3M7g 8IMnjPWwbzSUwVewaz2ANBG4bwQT4YW0nKCdQBbjRVIpSQW7wLUPmo.xCaUXXnR5_Hw7kDG3mKjR in0VeL3RhbgGZDEZlY8P.LwDZ4ZZeiNoxIa4gEYC9b4mNNzQHZ8ew5R2eTL_88iKKtK9.RsV7kwv ocZBVQwJnmnxfZtfFNTuyJodLO2zhowE7mkEoI5HWncI1SoanConrR8fuCvoDWaFnLkazoOYDkKL 8Iq42Gw6kdrB1tCoCFwZ5JE3_OGdyElT5HfwxFJnnQF6iWuTBZ63fLkYuKbfHqlXCpwWjBoIXCkP sCItwzoufWIVQzxID7mJygAUXSwsCknrFNZ4JdxafB0a6jDDZCMrPT6kNzTl8PuZhut436u.ITgU NXOVEnceqo4vqn97kg46ZdgUZVKEcpV6wlAOyGt3ZV4ipSvHOm9nbit6QJ_qVMIj_UF3EMdjVcO2 NPZJLifhAA4yAoC_LvagzqO4aBM6DKLidE7KuM16OKFDy3IEwgTgNAn4I2j7kBlm.WhrRpB8Gbnt kMgqwwpw8WYgk.UwoesikaA5sfCgcSuQDc.f0Rtzue.BPOluTMdEOXJnVngo9FlXZfYtsB7a6.IS bBBrI70N4v_HINwCVTu.K1hllEfs_QgFxVJlKJlhmsfj0AE7uHcMoF88NmKFGjX8U_Otsjv48VPO IhXFVizFkAMMl7lExML6YmtJaNBQj4uEj.NPNldW.0GEtQvFrGxvtSh6WUZiSabkgdsKcrGKmbgV Bh32mLZcKO3kyHxQLB95eBjht3MNf4QHy0ijrvb_EZeLtgmjVVFUA1qfoXw.aO3iFckQiJIeRhfX i5i9IiE9jum2GVWoXWlroV5e66fvLV52EefQjRbvA7zmeUiLGsVfwgDBpPdA8aXYapvvsX01uXvB sqt0j_RPpv_zDti724Q4THrP3TF3VHZ2GjC1aKzBvijhqvIWoKRxIYK0hW0CQyrOtdkUgQb363Ry LCnyrpEdEZaOZxRXj6qdeSaYb2BqQZOHo7DnOxC0AEkuiZoEB_fH7eK6TCaWVVSS.shKuMDJfuSR c_TtWTzPmFUh7qddeTXWOVjm8sSMkzKoiKdgOqn1e4HkzDU1LsZVsuogE7dM2GaBpDhCFtW9aMKg c3dcJqx8P0fTix6rnrgyqTbUFoDbP5fL.TgD2cFl.SinD3Yo6Wf7Y2r5KJuNpBsF.91vqhAinRaN ChG4wBGVXwkOWOJ2KBAapIg-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ir2.yahoo.com with HTTP; Sat, 31 Dec 2022 00:51:06 +0000 Received: by hermes--production-ir2-5795fc58c8-g4k29 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 5cb3f743c7fd9e307154a84f6a660d52; Sat, 31 Dec 2022 00:51:03 +0000 (UTC) From: =?utf-8?Q?Daniel_Mart=C3=ADn?= To: bug-gnu-emacs@gnu.org Subject: [PATCH] Fontification of function declarators with reference return types is incorrect in c++-ts-mode Date: Sat, 31 Dec 2022 01:51:02 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" References: X-Mailer: WebService/1.1.20982 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Content-Length: 1636 Received-SPF: pass client-ip=77.238.176.207; envelope-from=mardani29@yahoo.es; helo=sonic306-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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Given the following valid C++ code: class Foo { public: Bar& getBar(); }; c++-ts-mode does not fontify getBar with the font-lock-function-name-face face. I've attached a fix to treat reference declarators in c-ts-mode--declarator-identifier similarly to pointer_declarators. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-fontification-of-C-functions-with-reference-retu.patch >From 19182746e53ca66dc94aea4a7cd91f67cc7e0aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sat, 31 Dec 2022 01:45:27 +0100 Subject: [PATCH] Fix fontification of C++ functions with reference return types * lisp/progmodes/c-ts-mode.el (c-ts-fontify-error): Treat reference_declarator nodes the same as pointer_declarator nodes when calculating the identifier to fontify. --- lisp/progmodes/c-ts-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 82a13e9762..3cb671f4c5 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -425,7 +425,7 @@ c-ts-mode--declarator-identifier ;; Recurse. ((or "attributed_declarator" "parenthesized_declarator") (c-ts-mode--declarator-identifier (treesit-node-child node 0 t))) - ("pointer_declarator" + ((or "pointer_declarator" "reference_declarator") (c-ts-mode--declarator-identifier (treesit-node-child node -1))) ((or "function_declarator" "array_declarator" "init_declarator") (c-ts-mode--declarator-identifier -- 2.34.1 --=-=-=-- ------------=_1672619221-25817-1--