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.devel Subject: Re: emacs-30 0fd259d166c 1/4: Fix elixir-ts-mode's range query Date: Tue, 10 Sep 2024 20:08:21 -0700 Message-ID: <7B633D38-06FA-4B32-BFB6-CFC7E15E9628@gmail.com> References: <172585397252.25544.14799687468267584593@vcs2.savannah.gnu.org> <20240909035253.077E8C41F21@vcs2.savannah.gnu.org> <87ikv3gox8.fsf@pub.pink> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3776.700.51\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_2711725A-90B5-4846-B6D7-FB9DDB2ACB30" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26089"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Emacs Devel , Wilhelm Kirschbaum To: john muhl Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Sep 11 05:09:23 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 1soDjM-0006eJ-OG for ged-emacs-devel@m.gmane-mx.org; Wed, 11 Sep 2024 05:09:20 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soDig-0003gD-8B; Tue, 10 Sep 2024 23:08:38 -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 1soDif-0003fu-DR for emacs-devel@gnu.org; Tue, 10 Sep 2024 23:08:37 -0400 Original-Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soDid-0007Rb-L5 for emacs-devel@gnu.org; Tue, 10 Sep 2024 23:08:37 -0400 Original-Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7191df6b5f5so29789b3a.0 for ; Tue, 10 Sep 2024 20:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726024114; x=1726628914; darn=gnu.org; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=MILMlW4X9WNA6zq1ZJxqDhtaOUdp24JZBXZonVE0/Hw=; b=jj2424xsG+TiNasb7lL1ys+7Bh/0ozJiVidSnoc1hnC/QIDWREuHhpOdF3X/kOIHjF gy1zfdhI1EBxeYSmGys7Ac4dDGklyUfMHUtyjOr5DyaiyTs0px1SmRb+cnzFzJeWdVyx 4qs+KV5JQ5to3iulPY8eL4JRH9NP6FDhw4cpbWgWWejCRAbhhRXVlJRpSqTb0waMKBin t/8m6SQGf2n40+vYJYu1CJVH3kyKJh78WUPBqmUV9I4aS4hPqtjXXGuosqNBjztHIatS 2AQg9/bDW8DJ4CIYYqSIQtNfQwgBoYBM5kcbzd61Jki+RN5aYeOtDmcNeq4NPoEzFwKl pEbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726024114; x=1726628914; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MILMlW4X9WNA6zq1ZJxqDhtaOUdp24JZBXZonVE0/Hw=; b=LPOWzZbMrA3z7Edi6MvtDkLui7IojZmcPnkXnXMAjRlOB5f+n6AnyPz5w/YUpAVvHa qwvpREhStXCqPD5WyZHp7ar34E1DmgFdjmyYV9cAIpe++/ewpeDcBRKClmjs0k0dqltQ Pfi4xhx3gbKQnaDVJxF37aMLek5qVcA07Vn82EA1RRhdS+Dtpw+HOKM9/Or2YVUKo4Vn sZBjKxXtTZ0bPUtCYJSUMbzgKBdRkN9NlFixOoi4xEwnm6rDmYRkf+YgxG3b2pt7N9wy Zi2qWfANAPXc7z+KiZiJ+3k3FpUtefsixi3lNDe8BZseO9MfRNZt8l/8D5mDL9Sui0g9 iszw== X-Gm-Message-State: AOJu0YyXA1TZj9ApjtDfDk0dVWTDgtYHOAVByAvR/WDSRIbsEugSIbUZ +pipEt9UnQJbLtUBc4ykOjncLtr1iTZwraw2truUUXSd1MYpz5J0 X-Google-Smtp-Source: AGHT+IFrW7lnpXGDXuFT1kPoHYT1gYLbUn3sL9LPeYDCWB9TN0b8jd9aSyoY2bthcDbrbbYH2JW5Yg== X-Received: by 2002:a05:6a00:6f19:b0:710:6f54:bc9c with SMTP id d2e1a72fcca58-718d5ded8b4mr19080957b3a.2.1726024113611; Tue, 10 Sep 2024 20:08:33 -0700 (PDT) Original-Received: from smtpclient.apple ([2601:646:8f81:6120:a1a8:5602:237b:300d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7190909250asm2035875b3a.133.2024.09.10.20.08.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2024 20:08:32 -0700 (PDT) In-Reply-To: <87ikv3gox8.fsf@pub.pink> X-Mailer: Apple Mail (2.3776.700.51) Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=casouri@gmail.com; helo=mail-pf1-x431.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: 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:323537 Archived-At: --Apple-Mail=_2711725A-90B5-4846-B6D7-FB9DDB2ACB30 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > The elixir mode tests started failing after this commit. Thanks for reporting this! Good thing we have the test :-) I=E2=80=99ve = fixed it on emacs-30. --Apple-Mail=_2711725A-90B5-4846-B6D7-FB9DDB2ACB30 Content-Disposition: attachment; filename=elixir-ts-mode-tests.log Content-Type: text/plain; x-unix-mode=0644; name="elixir-ts-mode-tests.log" Content-Transfer-Encoding: quoted-printable 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-res= ources/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 --Apple-Mail=_2711725A-90B5-4846-B6D7-FB9DDB2ACB30 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii >=20 >=20 > Yuan Fu writes: >=20 >> branch: emacs-30 >> commit 0fd259d166c0dca4d097ad026ac748748ba88497 >> Author: Yuan Fu >> Commit: Yuan Fu >>=20 >> Fix elixir-ts-mode's range query >>=20 >> * 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(-) >>=20 >> 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))))) >>=20 >> (defvar heex-ts--sexp-regexp) >> (defvar heex-ts--indent-rules) --Apple-Mail=_2711725A-90B5-4846-B6D7-FB9DDB2ACB30--