Re: emacs-31 29bbd02347d: Fix treesit_cursor_helper_1 for zero-width nodes (bug#81436)

Yuan Fu <[email protected]> writes:

Hi,

> branch: emacs-31
> commit 29bbd02347da44599cc9778d9d626fc5c8ca4b2e
> Author: Yuan Fu <[email protected]>
> Commit: Yuan Fu <[email protected]>
>
>     Fix treesit_cursor_helper_1 for zero-width nodes (bug#81436)
>     
>     * lisp/treesit.el (treesit--some): Add edebug declare.
>     * src/treesit.c (treesit_cursor_helper_1): Don't use
>     ts_tree_cursor_goto_first_child_for_byte for zero-width nodes.

I'm not sure whether it was *this* commit. However, tree-sitter tests on
emba fail now:

--8<---------------cut here---------------start------------->8---
Running 4 tests (2026-07-27 06:25:20+0000, selector `(and (not (or (tag :unstable) (tag :nativecomp))) (or "^treesit" "-ts-"))')
   passed  1/4  c-ts-mode-test-filling (1.076894 sec)
Test c-ts-mode-test-indentation backtrace:
  signal(ert-test-failed (("Mismatch in test \"Empty Line (Block Start
  ert-fail(("Mismatch in test \"Empty Line (Block Start)\", file /chec
  ert-test--erts-test(((code lambda nil (c-ts-mode) (setq-local indent
  ert-test-erts-file("/checkout/test/lisp/progmodes/c-ts-mode-resource
  #f(compiled-function () #<bytecode 0x123833ea4ef51714>)()
  #f(compiled-function () #<bytecode -0x1702ddea9755e86c>)()
  handler-bind-1(#f(compiled-function () #<bytecode -0x1702ddea9755e86
  ert--run-test-internal(#s(ert--test-execution-info :test ... :result
  ert-run-test(#s(ert-test :name c-ts-mode-test-indentation :documenta
  ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
  ert-run-tests((and (not (or (tag :unstable) (tag :nativecomp))) (or 
  ert-run-tests-batch((and (not (or (tag :unstable) (tag :nativecomp))
  ert-run-tests-batch-and-exit((and (not (or (tag :unstable) (tag :nat
  eval((ert-run-tests-batch-and-exit '(and (not (or (tag :unstable) (t
  command-line-1(("-L" ":." "-l" "ert" "--eval" "(setq treesit-extra-l
  command-line()
  normal-top-level()
Test c-ts-mode-test-indentation condition:
    (ert-test-failed
     ("Mismatch in test \"Empty Line (Block Start)\", file /checkout/test/lisp/progmodes/c-ts-mode-resources/indent.erts"
      "int\nmain (void)\n{\n\n" "int\nmain (void)\n{\n  \n"))
   FAILED  2/4  c-ts-mode-test-indentation (3.486922 sec) at lisp/progmodes/c-ts-mode-tests.el:26
   passed  3/4  c-ts-mode-test-indentation-bsd (0.431736 sec)
   passed  4/4  c-ts-mode-test-indentation-preproc (0.130433 sec)

Ran 4 tests, 3 results as expected, 1 unexpected (2026-07-27 06:25:26+0000, 6.023617 sec)
--8<---------------cut here---------------end--------------->8---