From unknown Mon Jun 23 04:09:24 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#65113 <65113@debbugs.gnu.org> To: bug#65113 <65113@debbugs.gnu.org> Subject: Status: Emacs-29 and master csharp-mode with broken treesit Reply-To: bug#65113 <65113@debbugs.gnu.org> Date: Mon, 23 Jun 2025 11:09:24 +0000 retitle 65113 Emacs-29 and master csharp-mode with broken treesit reassign 65113 emacs submitter 65113 J M severity 65113 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:04:18 2023 Received: (at submit) by debbugs.gnu.org; 6 Aug 2023 15:04:18 +0000 Received: from localhost ([127.0.0.1]:59792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfIo-0001wT-GV for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:04:18 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfIl-0001wF-Ip for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:04:17 -0400 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 1qSfIf-0005Kp-Ss for bug-gnu-emacs@gnu.org; Sun, 06 Aug 2023 11:04:10 -0400 Received: from mx2.tbm.email ([51.38.32.223] helo=mx2.tbmatrix.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSfId-0007VZ-Gu for bug-gnu-emacs@gnu.org; Sun, 06 Aug 2023 11:04:09 -0400 From: J M DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tbm.email; s=mail; t=1691334236; bh=mqYUDuylhOtY3KFrqm+I1i5BO4nR8zfqedsGAVXZHK4=; h=From:Subject:To; b=XwxYHBU2oz4PNBU41lPcXba+xwffNZS+YAkwKGIbcIAcQzM1IpJVu41k34/GkI/n2 MFY6ATZzMyDJ1cM0MQTPwe9Chcs+2JQitpeQinDY3bzDuwnkYDzjutuwRDzRB1jazl v9PGwaK1n2syKZtZtkX4U1heaRD3nhx9/TAYmBtP3XCduGQ4P44Ru2vozhl+UQrruN MteFiZW6CcTZ8F2MQ5UT7wsuD6OVOJQx0tm3XACwS0tXky7SJutWT3TLm3+3BdCV5v pEp7jTAARDyPpFu9XO3s+gwWBv6cfqwWolKo1F0qMUEo2Ghgg3KGvfzFCoUSKa7sUF I1cc7y5MH1cQbRVy0uXbDuRBt60g38GLdgwhadfbGi/KiNJVRwIlM9eXJb1bbay4gD mYm4yueKljKpMIq1Qrl39QTdvaHcfnJKLXzIrhAeCCppYeYnTeKV/SFgM8j7uTsI5n BfTI3NZCHR4pLKknJRcFRx1s5/MyMvK2+j7dCtUERDB6wTg0ajAiiiXtWTSlwxt97F mU8IMFqqYpQ2YkaPb7H351Cqqo92/+M0vlkBXnbGLcnMGAJqOBG6ZjF4L9xs50dv53 Vgvg2RsO09OD1Zr7MuLIAgWOCC2qIbiRCIePJK09UqBGocGqV9gIH05SVY7axGjNrp Eh2GT823WSAUqotR9lWceHgM= Content-Type: multipart/alternative; boundary="Apple-Mail=_028EF548-C22C-4D8D-838C-1A9D59CDDE47" Mime-Version: 1.0 Subject: Emacs-29 and master csharp-mode with broken treesit Message-Id: Date: Sun, 6 Aug 2023 16:03:45 +0100 To: bug-gnu-emacs@gnu.org Received-SPF: pass client-ip=51.38.32.223; envelope-from=jean@tbm.email; helo=mx2.tbmatrix.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) --Apple-Mail=_028EF548-C22C-4D8D-838C-1A9D59CDDE47 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hi all Treesit is broken for csharp-mode in the latest version in master and = emacs-29 and therefore does not provide syntax highlighting. =EF=BF=BC The latest grammar repository = (https://github.com/tree-sitter/tree-sitter-c-sharp) has removed the = keyword void_keyword. Please see attached the patch to resolve the issue. Thanks Jean M= --Apple-Mail=_028EF548-C22C-4D8D-838C-1A9D59CDDE47 Content-Type: multipart/mixed; boundary="Apple-Mail=_9B14C545-D3E2-43FF-B028-473752B55604" --Apple-Mail=_9B14C545-D3E2-43FF-B028-473752B55604 Content-Transfer-Encoding: 7bit Content-Type: text/html; charset=us-ascii Hi all

Treesit is broken for csharp-mode in the latest version in master and emacs-29 and therefore does not provide syntax highlighting. 
--Apple-Mail=_9B14C545-D3E2-43FF-B028-473752B55604 Content-Disposition: attachment; filename=treesit_void_keyword_removed_from_grammar.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="treesit_void_keyword_removed_from_grammar.patch" Content-Transfer-Encoding: 7bit diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el index 00587a8a515..1a753cb309b 100644 --- a/lisp/progmodes/csharp-mode.el +++ b/lisp/progmodes/csharp-mode.el @@ -844,7 +844,7 @@ csharp-ts-mode--font-lock-settings (constructor_declaration name: (_) @font-lock-type-face) - (method_declaration type: [(identifier) (void_keyword)] @font-lock-type-face) + (method_declaration type: [(identifier) (predefined_type)] @font-lock-type-face) (method_declaration type: (generic_name (identifier) @font-lock-type-face)) (method_declaration name: (_) @font-lock-function-name-face) --Apple-Mail=_9B14C545-D3E2-43FF-B028-473752B55604 Content-Transfer-Encoding: 7bit Content-Type: text/html; charset=us-ascii

The latest grammar repository (https://github.com/tree-sitter/tree-sitter-c-sharp) has removed the keyword void_keyword.

Please see attached the patch to resolve the issue.

Thanks
Jean M
--Apple-Mail=_9B14C545-D3E2-43FF-B028-473752B55604-- --Apple-Mail=_028EF548-C22C-4D8D-838C-1A9D59CDDE47-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:36:42 2023 Received: (at 65113) by debbugs.gnu.org; 6 Aug 2023 15:36:42 +0000 Received: from localhost ([127.0.0.1]:59929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfo9-0005P3-Ll for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:36:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfo4-0005Ol-Jz for 65113@debbugs.gnu.org; Sun, 06 Aug 2023 11:36:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSfny-0007P6-AG; Sun, 06 Aug 2023 11:36:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=515mC8QuALIKy02G7zSC7m+y1ZLF5tyYdsxCkCp7A/E=; b=db340pb8vocsmgitYhL4 5HeTS1UZHgt9TCl8j5OkIXxr2hmlYcM3LAdMP8k9x73g8L+Wyegiv0ChP8nYh6nNSFTLbSjh1w6AH Dy1GPHbjuN+oLd2ollFvf/C1DjnfnSMrkT9MpnZI0qT/osJ1Yl0ySMn0dlzSwcVmGohpxUfgqQ7sI EffjTPbSGt/CA1AmSX8tbFgijeIjXTxOopfHygAL3TXmwEZN/7wn6N4eORJdIZDRVVMxHlAOANcuZ x73bso7buJYQKoT3WRTC1ZyAr8OC33zpI43NvmEPcAJ/CN+f+N1ALKXJaq49ZF0R7KXK6S69RfJTE McOjD4RkerOYlQ==; Date: Sun, 06 Aug 2023 18:36:47 +0300 Message-Id: <83fs4wp4hc.fsf@gnu.org> From: Eli Zaretskii To: J M , Theodor Thornhill , Yuan Fu In-Reply-To: (message from J M on Sun, 6 Aug 2023 16:03:45 +0100) Subject: Re: bug#65113: Emacs-29 and master csharp-mode with broken treesit References: MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65113 Cc: 65113@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: -3.3 (---) > From: J M > Date: Sun, 6 Aug 2023 16:03:45 +0100 > > Treesit is broken for csharp-mode in the latest version in master and emacs-29 and therefore does not provide syntax highlighting.  > > The latest grammar repository (https://github.com/tree-sitter/tree-sitter-c-sharp) has removed the keyword void_keyword. > > Please see attached the patch to resolve the issue. Thanks, but your patch will not work with the older version of the grammar library, right? Is it possible to make a patch that will work with both? Wed cannot rely on users having the latest grammar versions, so a backward-compatible change is much more preferable. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 07 01:46:15 2023 Received: (at 65113) by debbugs.gnu.org; 7 Aug 2023 05:46:15 +0000 Received: from localhost ([127.0.0.1]:60349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSt4J-00022L-Co for submit@debbugs.gnu.org; Mon, 07 Aug 2023 01:46:15 -0400 Received: from out-99.mta0.migadu.com ([2001:41d0:1004:224b::63]:15345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSt4E-000227-88 for 65113@debbugs.gnu.org; Mon, 07 Aug 2023 01:46:14 -0400 Date: Mon, 07 Aug 2023 07:46:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1691387168; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jyc5yr7lITtI+vOf1tWR2Rv4/3FUQtszjsuvscPWyvg=; b=zVzgC2z3T2UXkhYcXsnfAJk79+FzkuvM/q8kWctatItY7tW5odYSJFAZE0nYdhb85sTQh9 r3ZxGtExBQPLtv+w9ra0rLGxKH2mr5tWAhhsc17SQ//3MbY5x1Eyaw2bPyjphiSvoPF3V0 2iNum7ccup7oHV9wBGI0ALiQwL0HK1Ml5KvjWk9DyxZILTkwNmE/ScCVF000Spym/lByyi 5sKFMTqF9EFFoB48FSSPGdsS2IqonLLrMsYS+0o2VIpInik/UldiknqUVXcFKVF4fbt6nQ sXBhnWvU1b3tnlHOdvYHiiWDYgL/5BqzZB0TkQug+hWm9kMCF3eApqJhBZtPHA== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Theodor Thornhill To: Eli Zaretskii , J M , Yuan Fu Subject: Re: bug#65113: Emacs-29 and master csharp-mode with broken treesit In-Reply-To: <83fs4wp4hc.fsf@gnu.org> References: <83fs4wp4hc.fsf@gnu.org> Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 65113 Cc: 65113@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 (-) On 6 August 2023 17:36:47 CEST, Eli Zaretskii wrote: >> From: J M >> Date: Sun, 6 Aug 2023 16:03:45 +0100 >>=20 >> Treesit is broken for csharp-mode in the latest version in master and e= macs-29 and therefore does not provide syntax highlighting=2E =EF=BF=BC >>=20 >> The latest grammar repository (https://github=2Ecom/tree-sitter/tree-si= tter-c-sharp) has removed the keyword void_keyword=2E >>=20 >> Please see attached the patch to resolve the issue=2E > >Thanks, but your patch will not work with the older version of the >grammar library, right? Is it possible to make a patch that will work >with both? Wed cannot rely on users having the latest grammar >versions, so a backward-compatible change is much more preferable=2E We've had some similar patches lately that you can use for inspiration=2E Thanks, Theo From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 05:05:40 2023 Received: (at 65113) by debbugs.gnu.org; 10 Aug 2023 09:05:40 +0000 Received: from localhost ([127.0.0.1]:41356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qU1bw-0005v9-1V for submit@debbugs.gnu.org; Thu, 10 Aug 2023 05:05:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qU1bt-0005ut-6d for 65113@debbugs.gnu.org; Thu, 10 Aug 2023 05:05:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qU1bi-0005qC-KG; Thu, 10 Aug 2023 05:05:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=3gMFCV1EfmsYPgHPn7D2QZGYoyulHam3UKGd/Afu5ts=; b=eDOyC3E/yQKzBfg5ls7k 3pnmG42ydvzkNrtQhPzNXD2nsHnoxpEf+8zmG9CLGVhwdkHqEAJTm7Ma1+JOim5RS9yAEwX4wCXmE 7s335cjef3wiQ9UvxANhmN58tW0+9/V/GroS5HRPWEQy6d022kHnKZnu7sf0r58DXCK28v1jvJAUd V5wbHb6d5pcXEPXvoEiO2Wl1gGn7Fa5HByNagWRNDHI4qYNIBIjKKX2EApW5ppGQ4QKnyQzIHkabA FmLC+Meu2SqkFx/R6c3k39XHRQtgyKTf9JmT5NnHqPvIahmi/H/HUR4hQyJ+6O+SLlh058QsRFa+U EX8Mbme6lBLr5Q==; Date: Thu, 10 Aug 2023 12:05:51 +0300 Message-Id: <834jl7jmhc.fsf@gnu.org> From: Eli Zaretskii To: jean@tbm.email, Theodor Thornhill In-Reply-To: (message from Theodor Thornhill on Mon, 07 Aug 2023 07:46:05 +0200) Subject: Re: bug#65113: Emacs-29 and master csharp-mode with broken treesit References: <83fs4wp4hc.fsf@gnu.org> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65113 Cc: casouri@gmail.com, 65113@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: -3.3 (---) > Date: Mon, 07 Aug 2023 07:46:05 +0200 > From: Theodor Thornhill > CC: 65113@debbugs.gnu.org Ping! Can we please have a patch that is backward-compatible? > On 6 August 2023 17:36:47 CEST, Eli Zaretskii wrote: > >> From: J M > >> Date: Sun, 6 Aug 2023 16:03:45 +0100 > >> > >> Treesit is broken for csharp-mode in the latest version in master and emacs-29 and therefore does not provide syntax highlighting.  > >> > >> The latest grammar repository (https://github.com/tree-sitter/tree-sitter-c-sharp) has removed the keyword void_keyword. > >> > >> Please see attached the patch to resolve the issue. > > > >Thanks, but your patch will not work with the older version of the > >grammar library, right? Is it possible to make a patch that will work > >with both? Wed cannot rely on users having the latest grammar > >versions, so a backward-compatible change is much more preferable. > > We've had some similar patches lately that you can use for inspiration. > > Thanks, > Theo > From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 18:42:38 2023 Received: (at 65113) by debbugs.gnu.org; 10 Aug 2023 22:42:38 +0000 Received: from localhost ([127.0.0.1]:44234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUEMY-0003a5-Ab for submit@debbugs.gnu.org; Thu, 10 Aug 2023 18:42:38 -0400 Received: from mx2.tbm.email ([51.38.32.223]:58758 helo=mx2.tbmatrix.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUEMV-0003Zt-32 for 65113@debbugs.gnu.org; Thu, 10 Aug 2023 18:42:37 -0400 From: J M DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tbm.email; s=mail; t=1691707353; bh=+U5ztPyP7WqOtwxyBJaQzAnZyEGh0x5nH4hMNNSqvO8=; h=From:Subject:In-Reply-To:Cc:To:References; b=EqhsCcEnmcS6LdeZd5Jx8pHfcSzwoPx23vmF1pkZ1+voW1lfwB70+byWTAHm6bwQc g6qHJKATIgHC2mxKj8033O8CNqwhtRpB7JK8z5wRalQPwASvZmult6joGpz3nnP5vT U5wT8Djp12KkqdgnLq7QnanlZ30k/K/xey5Ik4rAlTgmpRnWD/o4ZOeJrBVpTAwQQJ YEONgMcgTpKXqF0mRVOUBoaMMFb1cA88wfACzJ1ZLXge6HZN7GP59nrUfv9YJAjKz0 ruPfLoqYHhKBeeHXDfFPDXRjiZkdzxIIJrv+/g1viah+oL4j1b86m+vE6/cJg3gFFJ 16BEgO/Kv1zAnN2HBYshXe5xAvVWImRfGtZxrtrAK1xYHMCCfiaK1GgHWd4yvspIA7 jfdl0uuQ4X1V9bM998jxKSYdpiSIvRVWm5tEl0VnxqH8A18hpKXh8+b6F1lpgaEu4J wNmfI9GLkM1cKv+CiPto4os9AdIMA7Vd3hUKY34sc+Bk45NQ/auGwFpiUuxP7p/hBr EijrvSya7Eswt5clZNIRZYqf6y0pXzv+j8pBXdeQwR/d1lEzD8WyqxQ7XbjYWjkB6T UQUaztI9oNRa77b2zqAWSSK5xZpdyxAvxCF6XEp9109xWyKlRTiuSaIJLVf4o0H2Jx 9wDyvcZ+iKpdDWO597fObjVc= Message-Id: <42C29EBD-86EA-4F55-AD84-CBA7F9AE6A60@tbm.email> Content-Type: multipart/mixed; boundary="Apple-Mail=_C0C44D38-A232-4AD9-AC2A-FE9CA349144D" Mime-Version: 1.0 Subject: Re: bug#65113: Emacs-29 and master csharp-mode with broken treesit Date: Thu, 10 Aug 2023 23:42:22 +0100 In-Reply-To: <834jl7jmhc.fsf@gnu.org> To: Eli Zaretskii References: <83fs4wp4hc.fsf@gnu.org> <834jl7jmhc.fsf@gnu.org> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 65113 Cc: casouri@gmail.com, 65113@debbugs.gnu.org, Theodor Thornhill 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 (-) --Apple-Mail=_C0C44D38-A232-4AD9-AC2A-FE9CA349144D Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Hi Eli See attached the requested backward-compatible change. --Apple-Mail=_C0C44D38-A232-4AD9-AC2A-FE9CA349144D Content-Disposition: attachment; filename=0001-Update-csharp-treesit-support-due-to-upstream-change.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-Update-csharp-treesit-support-due-to-upstream-change.patch" Content-Transfer-Encoding: quoted-printable =46rom=20ca9ad7d0738e71775bdc1d83f7aa5a2849ba5a8b=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20J=20M=20=0ADate:=20Thu,=2010=20= Aug=202023=2023:23:20=20+0100=0ASubject:=20[PATCH]=20Update=20csharp=20= treesit=20support=20due=20to=20upstream=20changes=0A=20(bug#65113)=0A=0A= A=20change=20in=20tree-sitter-c-sharp=20grammar=20for=20csharp=20(commit=0A= 18a531),=20has=20removed=20the=20keyword=20void_keyword=20and=20advised=0A= we=20should=20use=20predefined_type=0A---=0A=20= lisp/progmodes/csharp-mode.el=20|=2011=20++++++++---=0A=201=20file=20= changed,=208=20insertions(+),=203=20deletions(-)=0A=0Adiff=20--git=20= a/lisp/progmodes/csharp-mode.el=20b/lisp/progmodes/csharp-mode.el=0A= index=2000587a8a515..74968f3a06a=20100644=0A---=20= a/lisp/progmodes/csharp-mode.el=0A+++=20b/lisp/progmodes/csharp-mode.el=0A= @@=20-816,7=20+816,7=20@@=20csharp-ts-mode--font-lock-settings=0A=20=20=20= =20:language=20'c-sharp=0A=20=20=20=20:feature=20'definition=0A=20=20=20=20= :override=20t=0A-=20=20=20'((qualified_name=20(identifier)=20= @font-lock-type-face)=0A+=20=20=20`((qualified_name=20(identifier)=20= @font-lock-type-face)=0A=20=20=20=20=20=20(using_directive=20= (identifier)=20@font-lock-type-face)=0A=20=20=20=20=20=20= (using_directive=20(name_equals=0A=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20(identifier)=20@font-lock-type-face))=0A= @@=20-843,8=20+843,13=20@@=20csharp-ts-mode--font-lock-settings=0A=20=20=20= =20=20=20(class_declaration=20(identifier)=20@font-lock-type-face)=0A=20=0A= =20=20=20=20=20=20(constructor_declaration=20name:=20(_)=20= @font-lock-type-face)=0A-=0A-=20=20=20=20=20(method_declaration=20type:=20= [(identifier)=20(void_keyword)]=20@font-lock-type-face)=0A+=20=20=20=20=20= ;;;=20Handle=20different=20releases=20of=20tree-sitter-c-sharp.=0A+=20=20= =20=20=20;;;=20Check=20if=20keyword=20void_keyword=20is=20available,=20= then=20return=20the=20correct=20rule."=0A+=20=20=20=20=20= ,@(condition-case=20nil=0A+=20=20=20=20=20=20=20=20=20=20=20(progn=20= (treesit-query-capture=20'csharp=20'((void_keyword)=20@capture))=0A+=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20`((method_declaration=20= type:=20[(identifier)=20(void_keyword)]=20@font-lock-type-face)))=0A+=20=20= =20=20=20=20=20=20=20(error=0A+=20=20=20=20=20=20=20=20=20=20= `((method_declaration=20type:=20[(identifier)=20(predefined_type)]=20= @font-lock-type-face))))=0A=20=20=20=20=20=20(method_declaration=20type:=20= (generic_name=20(identifier)=20@font-lock-type-face))=0A=20=20=20=20=20=20= (method_declaration=20name:=20(_)=20@font-lock-function-name-face)=0A=20=0A= --=20=0A=0A= --Apple-Mail=_C0C44D38-A232-4AD9-AC2A-FE9CA349144D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 10 Aug 2023, at 10:05, Eli Zaretskii wrote: >=20 >> Date: Mon, 07 Aug 2023 07:46:05 +0200 >> From: Theodor Thornhill >> CC: 65113@debbugs.gnu.org >=20 > Ping! Can we please have a patch that is backward-compatible? >=20 >> On 6 August 2023 17:36:47 CEST, Eli Zaretskii wrote: >>>> From: J M >>>> Date: Sun, 6 Aug 2023 16:03:45 +0100 >>>>=20 >>>> Treesit is broken for csharp-mode in the latest version in master = and emacs-29 and therefore does not provide syntax highlighting. =EF=BF=BC= >>>>=20 >>>> The latest grammar repository = (https://github.com/tree-sitter/tree-sitter-c-sharp) has removed the = keyword void_keyword. >>>>=20 >>>> Please see attached the patch to resolve the issue. >>>=20 >>> Thanks, but your patch will not work with the older version of the >>> grammar library, right? Is it possible to make a patch that will = work >>> with both? Wed cannot rely on users having the latest grammar >>> versions, so a backward-compatible change is much more preferable. >>=20 >> We've had some similar patches lately that you can use for = inspiration. >>=20 >> Thanks, >> Theo >>=20 --Apple-Mail=_C0C44D38-A232-4AD9-AC2A-FE9CA349144D-- From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 11 01:57:30 2023 Received: (at 65113) by debbugs.gnu.org; 11 Aug 2023 05:57:30 +0000 Received: from localhost ([127.0.0.1]:44727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUL9O-00070o-Ia for submit@debbugs.gnu.org; Fri, 11 Aug 2023 01:57:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUL9N-00070c-EN for 65113@debbugs.gnu.org; Fri, 11 Aug 2023 01:57:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUL9G-0003LA-Tk; Fri, 11 Aug 2023 01:57:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=gjLayo6gTbSwn5sDgujmW+v9dfEolkFCH6lKu8Gpu/A=; b=ANbj2Kl391aB 7gZHW3qlQZtdR7o3Jnm8IBV38UPYT9MAC1hayYA5pDOKoenXotjlpCY1NcC0TNFnqLpYL5is/iZBr vuweYmxqof/mKoi1ssrg/VBA0aSZ550k8NW/dkeF5ErtN7dv5O4w+0m9/Z+/0Z8XYOQWH7Q3lIG/s V530BM8NM3gLRr+D+FmF5Sv3ng56Cau2DR+wg8Vti+IFssxKOdhHBtywc7tGfnt9pg6JbyjYI5BfC 453oDbw1lAxCsNiEozLc7paSOPaf7KZ33TULP2VvaIWgfBI9R9mioN2aCqh2xeq9Acj/1AfU7aJOz xbAHzID9TVBdEDADe3V1EQ==; Date: Fri, 11 Aug 2023 08:57:50 +0300 Message-Id: <83v8dmgly9.fsf@gnu.org> From: Eli Zaretskii To: J M In-Reply-To: <42C29EBD-86EA-4F55-AD84-CBA7F9AE6A60@tbm.email> (message from J M on Thu, 10 Aug 2023 23:42:22 +0100) Subject: Re: bug#65113: Emacs-29 and master csharp-mode with broken treesit References: <83fs4wp4hc.fsf@gnu.org> <834jl7jmhc.fsf@gnu.org> <42C29EBD-86EA-4F55-AD84-CBA7F9AE6A60@tbm.email> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65113 Cc: casouri@gmail.com, 65113@debbugs.gnu.org, theo@thornhill.no 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: -3.3 (---) > From: J M > Date: Thu, 10 Aug 2023 23:42:22 +0100 > Cc: Theodor Thornhill , > casouri@gmail.com, > 65113@debbugs.gnu.org > > See attached the requested backward-compatible change. Thank you! Should we perhaps swap the order, and query first about the newer type, so as to make the code a bit faster when used with the latest grammar? From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 12 03:26:52 2023 Received: (at 65113-done) by debbugs.gnu.org; 12 Aug 2023 07:26:52 +0000 Received: from localhost ([127.0.0.1]:48642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUj1P-0004xM-PF for submit@debbugs.gnu.org; Sat, 12 Aug 2023 03:26:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUj1N-0004x2-F1 for 65113-done@debbugs.gnu.org; Sat, 12 Aug 2023 03:26:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUj1H-0004wU-01; Sat, 12 Aug 2023 03:26:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=svorZAkJYdPjrsBu6LJYB6FxTV9xN/uW258d7nV4HWI=; b=Mc0F+WBNAIWV OZBaGKhL6R4ga+YW/H0T2Ix893/BpGGVEmn1LrscMqkzZbyd9Z0MwcoeDBfCiEPhS53QZ3UMzSfRM pDSvXNKnJWW6sTUHHZMVJcGCLkYsMs6fcVi0ELC464jXESfN3aOM0/NJov751y/CN9lPg518PNPjV fiks93yYs5kwAitKVgE0JwLwCvz4zGIlbD1HovNdCRyfHTnRpCgNNk0Lziuy/Xm7VUYyD91nozaSy GZmOG/W6c/wa1atISYc7v1y2iw7PO9sJEdI6+6vQn/Emv7reSEVJZuYuy5tBm0rjL5ehUQLKlZpwD T6c00Qy6JKn6SgDxWTfwsQ==; Date: Sat, 12 Aug 2023 10:27:14 +0300 Message-Id: <83sf8oen59.fsf@gnu.org> From: Eli Zaretskii To: J M In-Reply-To: <42C29EBD-86EA-4F55-AD84-CBA7F9AE6A60@tbm.email> (message from J M on Thu, 10 Aug 2023 23:42:22 +0100) Subject: Re: bug#65113: Emacs-29 and master csharp-mode with broken treesit References: <83fs4wp4hc.fsf@gnu.org> <834jl7jmhc.fsf@gnu.org> <42C29EBD-86EA-4F55-AD84-CBA7F9AE6A60@tbm.email> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65113-done Cc: casouri@gmail.com, theo@thornhill.no, 65113-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: -3.3 (---) > From: J M > Date: Thu, 10 Aug 2023 23:42:22 +0100 > Cc: Theodor Thornhill , > casouri@gmail.com, > 65113@debbugs.gnu.org > > See attached the requested backward-compatible change. Thanks, installed on the emacs-29 branch, and closing the bug. Please in the future accompany your changes with a ChangeLog-style description of files and functions where you make changes (I did it this time for you). From unknown Mon Jun 23 04:09:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 09 Sep 2023 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator