From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.bugs Subject: bug#70296: 29.3.50 ; [PATCH] Update go-ts-mode to support latest go grammar Date: Mon, 8 Apr 2024 20:24:56 -0700 Message-ID: <18D69882-6FD2-453D-AEF9-5E0A86AC7EC0@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_2BAEE6F0-231A-4C85-991F-C46ED981B04A" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4689"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dev@rjt.dev To: 70296@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Apr 09 05:26:02 2024 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 1ru27V-0000wh-3P for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 09 Apr 2024 05:26:01 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ru27R-0003lI-1R; Mon, 08 Apr 2024 23:25:57 -0400 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 1ru27Q-0003l6-6S for bug-gnu-emacs@gnu.org; Mon, 08 Apr 2024 23:25:56 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru27P-0005to-Sz for bug-gnu-emacs@gnu.org; Mon, 08 Apr 2024 23:25:55 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ru27X-0007uU-KK; Mon, 08 Apr 2024 23:26:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: dev@rjt.dev, bug-gnu-emacs@gnu.org Resent-Date: Tue, 09 Apr 2024 03:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70296 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: Bug Report Emacs X-Debbugs-Original-Xcc: dev@rjt.dev Original-Received: via spool by submit@debbugs.gnu.org id=B.171263312930176 (code B ref -1); Tue, 09 Apr 2024 03:26:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 9 Apr 2024 03:25:29 +0000 Original-Received: from localhost ([127.0.0.1]:47966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru26z-0007qb-2P for submit@debbugs.gnu.org; Mon, 08 Apr 2024 23:25:29 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:49084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru26v-0007pb-MZ for submit@debbugs.gnu.org; Mon, 08 Apr 2024 23:25:27 -0400 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 1ru26i-0003dj-Kd for bug-gnu-emacs@gnu.org; Mon, 08 Apr 2024 23:25:12 -0400 Original-Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru26h-0005ia-43 for bug-gnu-emacs@gnu.org; Mon, 08 Apr 2024 23:25:12 -0400 Original-Received: by mail-oi1-x22e.google.com with SMTP id 5614622812f47-3c3e6ea6d2fso3617665b6e.2 for ; Mon, 08 Apr 2024 20:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712633109; x=1713237909; darn=gnu.org; h=to:date:message-id:subject:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=8YbBmJ1r0NkMsOAqe0i+mQInJi4zRK7YM6x0ziY+QAc=; b=dQALn712WorBp7L6QzXEZLCI6kdZXiM7EZjM5j0gbEHTfU1tG19pJtp5Zle7yL+Qsg FsC8EB0pQUMRaMsazk2vmi4m2noLYTaTq5XOL/s4bcTeznWCAVKYNEvqNzA/XnJ+CcEz ZIOIFAZWgQ8RtvHf+bjnKTqH2dW/QTVDO+ZvgG/04QmahVF01yzmy+oTHg3d8srV4fqX BxfbslkSrYqQQR2ZxsYTWu0CzIjSrS8wDEpQiwWG7LntRdHbJFAGa83irJ5ypAS1VAQA EQWn4bEgmyqK5rmRIFHER5HBAARI/Gc3mar0MeItRiqtjlq7iEagRU+GudT0V4lX/SnF zhrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712633109; x=1713237909; h=to:date:message-id:subject:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8YbBmJ1r0NkMsOAqe0i+mQInJi4zRK7YM6x0ziY+QAc=; b=KC56/55CI2AwequplsGOxXAzTHBqcA2j4tJIwqEanQQtORj31aRafZxNDnf0MG87nv LIti6DCMhzCa1z/k6r8+JOlQ0wkv0+ap7a5VzN0WjVAnH1JyyzUgSghounGluS4Lw5JT IcI/2BTJt1q6yO4h/h+qwXwJHHqme9kiiWE6oAFSTHBMDW0I7+f8AqqhskPPOGAnN9tz t32XzGeMtFVPoLD67qOvs5YKPb3K3MGL2reDzkjq08NFjxbrzNHn7IKkX9Rd2CFcRQEA 6/hgD3L5AXs/QpXe7RgH7XDr0Eemb/mRL330+7GBdmNTcdZkrnl34BZYYBgF726Szm84 apVg== X-Gm-Message-State: AOJu0YwrvAtsF0FqGNsMgAQWOPv/cAgQwxd2Y4UVlT0PNOba7TQWJHao yxN/EkO6xDt/WNvl4HMHYyEi/70RsB6bZcrfHrOtqmm9M4NBulpYRlgGi80n X-Google-Smtp-Source: AGHT+IGM1L2SzUN46/gOuO2ZqgswfwaIqGsWDmk6Yb8Vzo70qV87P5L+KomGdoO0rhmMNOiNyN6jwQ== X-Received: by 2002:a05:6808:1489:b0:3c5:f833:1fb1 with SMTP id e9-20020a056808148900b003c5f8331fb1mr4216439oiw.0.1712633109329; Mon, 08 Apr 2024 20:25:09 -0700 (PDT) Original-Received: from smtpclient.apple ([2601:641:300:4910:b561:5293:aa5:4618]) by smtp.gmail.com with ESMTPSA id x18-20020aa784d2000000b006eadc87233dsm7337387pfn.165.2024.04.08.20.25.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2024 20:25:08 -0700 (PDT) X-Mailer: Apple Mail (2.3731.700.6) Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=casouri@gmail.com; helo=mail-oi1-x22e.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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:282961 Archived-At: --Apple-Mail=_2BAEE6F0-231A-4C85-991F-C46ED981B04A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii X-Debbugs-CC: dev@rjt.dev tree-sitter-go changed method_spec to method_elem in = https://github.com/tree-sitter/tree-sitter-go/commit/b82ab803d887002a0af11= f6ce63d72884580bf33 so now go-ts-mode breaks on the lastest go grammar. This patch should = restore peace to go-ts-mode. Yuan --Apple-Mail=_2BAEE6F0-231A-4C85-991F-C46ED981B04A Content-Disposition: attachment; filename=go-ts-mode-method.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="go-ts-mode-method.patch" Content-Transfer-Encoding: quoted-printable =46rom=2007adcafc91b5d7249dcd79a20d4306bf103713fe=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Yuan=20Fu=20=0ADate:=20Mon,=20= 8=20Apr=202024=2020:20:25=20-0700=0ASubject:=20[PATCH]=20Update=20= go-ts-mode=20to=20support=20latest=20tree-sitter-go=20grammar=0A=0A= tree-sitter-go=20changed=20method_spec=20to=20method_elem=20in=0A= https://github.com/tree-sitter/tree-sitter-go/commit/b82ab803d887002a0af11= f6ce63d72884580bf33=0A=0A*=20lisp/progmodes/go-ts-mode.el:=0A= (go-ts-mode--method-elem-supported-p):=20New=20function.=0A= (go-ts-mode--font-lock-settings):=20Conditionally=20use=20method_elem=20= or=0Amethod_spec=20in=20the=20query.=0A---=0A=20= lisp/progmodes/go-ts-mode.el=20|=2013=20+++++++++++--=0A=201=20file=20= changed,=2011=20insertions(+),=202=20deletions(-)=0A=0Adiff=20--git=20= a/lisp/progmodes/go-ts-mode.el=20b/lisp/progmodes/go-ts-mode.el=0Aindex=20= e8a176e3d9d..a5b49bd8313=20100644=0A---=20a/lisp/progmodes/go-ts-mode.el=0A= +++=20b/lisp/progmodes/go-ts-mode.el=0A@@=20-112,6=20+112,13=20@@=20= go-ts-mode--iota-query-supported-p=0A=20=20=20(ignore-errors=0A=20=20=20=20= =20(or=20(treesit-query-string=20""=20'((iota)=20= @font-lock-constant-face)=20'go)=20t)))=0A=20=0A+;;=20tree-sitter-go=20= changed=20method_spec=20to=20method_elem=20in=0A+;;=20= https://github.com/tree-sitter/tree-sitter-go/commit/b82ab803d887002a0af11= f6ce63d72884580bf33=0A+(defun=20go-ts-mode--method-elem-supported-p=20()=0A= +=20=20"Return=20t=20if=20Go=20grammar=20uses=20`method_elem'=20instead=20= of=20`method_spec'."=0A+=20=20(ignore-errors=0A+=20=20=20=20(or=20= (treesit-query-string=20""=20'((method_elem)=20@cap)=20'go)=20t)))=0A+=0A= =20(defvar=20go-ts-mode--font-lock-settings=0A=20=20=20= (treesit-font-lock-rules=0A=20=20=20=20:language=20'go=0A@@=20-136,11=20= +143,13=20@@=20go-ts-mode--font-lock-settings=0A=20=0A=20=20=20=20= :language=20'go=0A=20=20=20=20:feature=20'definition=0A-=20=20=20= '((function_declaration=0A+=20=20=20`((function_declaration=0A=20=20=20=20= =20=20=20name:=20(identifier)=20@font-lock-function-name-face)=0A=20=20=20= =20=20=20(method_declaration=0A=20=20=20=20=20=20=20name:=20= (field_identifier)=20@font-lock-function-name-face)=0A-=20=20=20=20=20= (method_spec=0A+=20=20=20=20=20(,(if=20= (go-ts-mode--method-elem-supported-p)=0A+=20=20=20=20=20=20=20=20=20=20=20= 'method_elem=0A+=20=20=20=20=20=20=20=20=20'method_spec)=0A=20=20=20=20=20= =20=20name:=20(field_identifier)=20@font-lock-function-name-face)=0A=20=20= =20=20=20=20(field_declaration=0A=20=20=20=20=20=20=20name:=20= (field_identifier)=20@font-lock-property-name-face)=0A--=20=0A2.41.0=0A=0A= --Apple-Mail=_2BAEE6F0-231A-4C85-991F-C46ED981B04A--