Re: master 67ef1d54e7e 1/2: Make c-ts-common--fill-paragraph work for rust line comment

Re: master 67ef1d54e7e 1/2: Make c-ts-common--fill-paragraph work for rust line comment

[john muhl]

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

This caused a c-ts-mode test to start failing.

  make test/lisp/progmodes/c-ts-mode-tests.log


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

Running 4 tests (2024-04-24 02:52:40-0500, selector `(not (or (tag :expensive-test) (tag :unstable) (tag :nativecomp)))')
Test c-ts-mode-test-filling backtrace:
  signal(ert-test-failed (("Mismatch in test \"Not Over Fill 3\", file
  ert-fail(("Mismatch in test \"Not Over Fill 3\", file /home/build/em
  ert-test--erts-test(((code lambda nil (c-ts-mode) (setq-local indent
  ert-test-erts-file("/home/build/emacs/src-motif/test/lisp/progmodes/
  #[0 "\304C\3051\f\0\306C0\202\27\0\1\307\240\210\211@\1AD\262\1\310C
  #[0 "\303\300!\11>\204\17\0\304\305\306\300D\"\210\300\307H\303\1!\n
  handler-bind-1(#[0 "\303\300!\11>\204\17\0\304\305\306\300D\"\210\30
  ert--run-test-internal(#s(ert--test-execution-info :test ... :result
  ert-run-test(#s(ert-test :name c-ts-mode-test-filling :documentation
  ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
  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 c-ts-mode-test-filling condition:
    (ert-test-failed
     ("Mismatch in test \"Not Over Fill 3\", file /home/build/emacs/src-motif/test/lisp/progmodes/c-ts-mode-resources/filling.erts"
      "// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n// woooomy woooomy woooomy woooomy woooomy woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n"
      "// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n        // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n        // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n        // woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n"))
   FAILED  1/4  c-ts-mode-test-filling (0.057602 sec) at lisp/progmodes/c-ts-mode-tests.el:38
Mark set
   passed  2/4  c-ts-mode-test-indentation (1.366066 sec)
   passed  3/4  c-ts-mode-test-indentation-bsd (0.106362 sec)
   passed  4/4  c-ts-mode-test-indentation-preproc (0.066358 sec)

Ran 4 tests, 3 results as expected, 1 unexpected (2024-04-24 02:52:42-0500, 1.795714 sec)

1 unexpected results:
   FAILED  c-ts-mode-test-filling


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



Yuan Fu <casouri@gmail.com> writes:

> branch: master
> commit 67ef1d54e7e3983bb03840cf8f2990d579942710
> Author: Yuan Fu <casouri@gmail.com>
> Commit: Yuan Fu <casouri@gmail.com>
>
>     Make c-ts-common--fill-paragraph work for rust line comment
>     
>     * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): Back to
>     BOL before checking for //.
> ---
>  lisp/progmodes/c-ts-common.el | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
> index 457aa55c195..c06295b8a87 100644
> --- a/lisp/progmodes/c-ts-common.el
> +++ b/lisp/progmodes/c-ts-common.el
> @@ -125,6 +125,9 @@ ARG is passed to `fill-paragraph'."
>                              (treesit-node-type node))
>          (if (save-excursion
>                (goto-char (treesit-node-start node))
> +              ;; In rust, NODE will be the body of a comment excluding
> +              ;; the //, so we need to go to BOL to check for //.
> +              (back-to-indentation)
>                (looking-at "//"))
>              (fill-comment-paragraph arg)
>            (c-ts-common--fill-block-comment arg)))

Re: master 67ef1d54e7e 1/2: Make c-ts-common--fill-paragraph work for rust line comment

[Yuan Fu]

> On Apr 25, 2024, at 5:55 PM, john muhl <jm@pub.pink> wrote:
> 
> This caused a c-ts-mode test to start failing.
> 
>  make test/lisp/progmodes/c-ts-mode-tests.log
> 
> <c-ts-mode-tests.log>

Thanks John! I pushed a fix for it.

Yuan