From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: john muhl Newsgroups: gmane.emacs.devel Subject: Re: emacs-30 0fd259d166c 1/4: Fix elixir-ts-mode's range query Date: Mon, 09 Sep 2024 18:00:40 -0500 Message-ID: <87ikv3gox8.fsf@pub.pink> References: <172585397252.25544.14799687468267584593@vcs2.savannah.gnu.org> <20240909035253.077E8C41F21@vcs2.savannah.gnu.org> 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="25727"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.12.1; emacs 31.0.50 Cc: Yuan Fu To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Sep 11 04:22:24 2024 Return-path: Envelope-to: ged-emacs-devel@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 1soCzv-0006W4-2s for ged-emacs-devel@m.gmane-mx.org; Wed, 11 Sep 2024 04:22:23 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soCzC-0003f0-WD; Tue, 10 Sep 2024 22:21:39 -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 1so8ja-0004ZY-CK for emacs-devel@gnu.org; Tue, 10 Sep 2024 17:49:14 -0400 Original-Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1so8jY-0004Jj-71 for emacs-devel@gnu.org; Tue, 10 Sep 2024 17:49:14 -0400 Original-Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id 60DC911401B2; Tue, 10 Sep 2024 17:49:09 -0400 (EDT) Original-Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Tue, 10 Sep 2024 17:49:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1726004949; x=1726091349; bh=y5/xQeCYJz ArvnEg9bJLqnDVGOG1bno5p1x+3oo224Y=; b=7jzW/lv9XUk3xLHW3TQeYMP2yZ GPPa9r01dCoQ9Tu+v0T3pAMyNJii+ucIkweg7qjK1lkO4iTSyUT+Es/UWTHX1+3r lRSjjCuPIDxJc1r+EuGM5Xm87b7OC/0C8hd52Snn1opvy0UeqYISXVSaRFBifCYz 0xeyPmmcMEu0Ia6+GmnGGaQjofrgcNtZ9rdsnNFzWPklfhSHHnq221uF2WGRupD5 tE3EUXGfHcuZtg/KHFqj+4lyywVwUvGmpZcI0zxXp68aibbUzyFlvjqPiISDQRIm WP8cxKnhqEfGt4/S3/YPMCwczY5bGO9lOYfml0jK0Ye2JbTGQj4cogDbKRBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1726004949; x=1726091349; bh=y5/xQeCYJzArvnEg9bJLqnDVGOG1 bno5p1x+3oo224Y=; b=sWc5h4wGb4XyjBL4lLInx+UKgfL+kihKxF4cdSLze8+q kFY50BNf82DKteE7jj1dFv0MlZq9f1JC90MYmiHakTr4uNgHiEAozYqZATiohYjI KsjM4WV0F/89Ex3INcp7eiWPUtssfWa9kuqvI6JlmV/yghzMXeKQ5DGElEM+2AbU k/xFpuKscrZXhu1dlsLHYLoJgT87f5tjYK8eT/PkrhjYyxP33SxbJqWwxAQAwpWD OjgTdYHK9HoZnwJzG6oGhGXsr/PULC3i2BielMlNjL3R6R6ad+w5xEFyhghMRVtj atTnroEA6OQpo8Hwp9Am6dQ3/h+ehh/MujNV8ROxAQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejtddgtdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf gjffhffgfkgggtsehmtderredtredtnecuhfhrohhmpehjohhhnhcumhhuhhhluceojhhm sehpuhgsrdhpihhnkheqnecuggftrfgrthhtvghrnhepvdetgfeijeeivdffieefveekff ffteffjeevffekgeefjeefudeuveekheegtdefnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepjhhmsehpuhgsrdhpihhnkhdpnhgspghrtghpth htohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheptggrshhouhhrihesghhm rghilhdrtghomhdprhgtphhtthhopegvmhgrtghsqdguvghvvghlsehgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i74194916:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Sep 2024 17:49:08 -0400 (EDT) In-Reply-To: <20240909035253.077E8C41F21@vcs2.savannah.gnu.org> (Yuan Fu's message of "Sun, 8 Sep 2024 23:52:52 -0400 (EDT)") Received-SPF: pass client-ip=103.168.172.158; envelope-from=jm@pub.pink; helo=fhigh7-smtp.messagingengine.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_12_24=1.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 10 Sep 2024 22:21:36 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:323535 Archived-At: --=-=-= Content-Type: text/plain The elixir mode tests started failing after this commit. --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=elixir-ts-mode-tests.log Running 1 tests (2024-09-09 05:57:39+0200, selector `(not (or (tag :expensive-test) (tag :unstable) (tag :nativecomp)))') Test elixir-ts-mode-test-indentation backtrace: signal(ert-test-failed (("Mismatch in test \"Embedded HEEx\", file / ert-fail(("Mismatch in test \"Embedded HEEx\", file /home/build/emac ert-test--erts-test(((code lambda nil (elixir-ts-mode) (indent-regio ert-test-erts-file("/home/build/emacs-build/src-minimal/test/lisp/pr #f(compiled-function () #)() #f(compiled-function () #)() handler-bind-1(#f(compiled-function () # ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ert-run-test(#s(ert-test :name elixir-ts-mode-test-indentation :docu ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) ( ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) ( command-line-1(("-L" ":." "-l" "ert" "--eval" "(setq treesit-extra-l command-line() normal-top-level() Test elixir-ts-mode-test-indentation condition: (ert-test-failed ("Mismatch in test \"Embedded HEEx\", file /home/build/emacs-build/src-minimal/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts" #("defmodule Foo do\n def foo(assigns) do\n ~H\"\"\"\n\n text\n\n \"\"\"\n end\nend\n" 0 47 (fontified nil) 47 48 (syntax-table (8) fontified nil) 48 77 (fontified nil) 77 78 (syntax-table (8) fontified nil) 78 89 (fontified nil)) "defmodule Foo do\n def foo(assigns) do\n ~H\"\"\"\n \n text\n \n \"\"\"\n end\nend\n")) FAILED 1/1 elixir-ts-mode-test-indentation (0.066101 sec) at lisp/progmodes/elixir-ts-mode-tests.el:26 Ran 1 tests, 0 results as expected, 1 unexpected (2024-09-09 05:57:39+0200, 0.130395 sec) 1 unexpected results: FAILED elixir-ts-mode-test-indentation --=-=-= Content-Type: text/plain Yuan Fu writes: > branch: emacs-30 > commit 0fd259d166c0dca4d097ad026ac748748ba88497 > Author: Yuan Fu > Commit: Yuan Fu > > Fix elixir-ts-mode's range query > > * lisp/progmodes/elixir-ts-mode.el: > (elixir-ts--treesit-range-rules): Add underscore in front of the name > capture, so Emacs won't put heex parser on it. > --- > lisp/progmodes/elixir-ts-mode.el | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el > index 9804152d9ab..815827ed13c 100644 > --- a/lisp/progmodes/elixir-ts-mode.el > +++ b/lisp/progmodes/elixir-ts-mode.el > @@ -572,7 +572,9 @@ > (treesit-range-rules > :embed 'heex > :host 'elixir > - '((sigil (sigil_name) @name (:match "^[HF]$" @name) (quoted_content) @heex))))) > + '((sigil (sigil_name) @_name > + (:match "^[HF]$" @_name) > + (quoted_content) @heex))))) > > (defvar heex-ts--sexp-regexp) > (defvar heex-ts--indent-rules) --=-=-=--