Re: emacs-30 0fd259d166c 1/4: Fix elixir-ts-mode's range query

[john muhl <jm@pub.pink>]

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

The elixir mode tests started failing after this commit.


[-- Attachment #2: elixir-ts-mode-tests.log --]
[-- Type: text/plain, Size: 2114 bytes --]

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 () #<bytecode 0x4b9a44325c9832>)()
  #f(compiled-function () #<bytecode -0xfc329de6ddc2e9>)()
  handler-bind-1(#f(compiled-function () #<bytecode -0xfc329de6ddc2e9>
  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<span>\n  text\n</span>\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    <span>\n      text\n    </span>\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


[-- Attachment #3: Type: text/plain, Size: 1087 bytes --]



Yuan Fu <casouri@gmail.com> writes:

> branch: emacs-30
> commit 0fd259d166c0dca4d097ad026ac748748ba88497
> Author: Yuan Fu <casouri@gmail.com>
> Commit: Yuan Fu <casouri@gmail.com>
>
>     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)