bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Mohammed Sadiq]

M-x align doesn't align function arguments or struct members, which
works fine in c-mode.

Say for example, if I mark the region around '(' and ')' and do M-x
align for the following code:

int
main (int argc,
       char *argv[])
{
}


I should get the following (see the change of spacing between 'int' and 
'argc'):

int
main (int   argc,
       char *argv[])
{
}


Modifying align-c++-modes to include c-ts-mode should be enough to fix 
this.

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Yuan Fu]

Mohammed Sadiq <sadiq@sadiqpk.org> writes:

> M-x align doesn't align function arguments or struct members, which
> works fine in c-mode.
>
> Say for example, if I mark the region around '(' and ')' and do M-x
> align for the following code:
>
> int
> main (int argc,
>       char *argv[])
> {
> }
>
>
> I should get the following (see the change of spacing between 'int'
> and 'argc'):
>
> int
> main (int   argc,
>       char *argv[])
> {
> }
>
>
> Modifying align-c++-modes to include c-ts-mode should be enough to fix
> this.

Could you go me a favor and look up where is align-c++-modes defined? Or
just paste the value of it, if it is programmatically defined. Thanks
:-)

Yuan

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Mohammed Sadiq]

>> 
>> Modifying align-c++-modes to include c-ts-mode should be enough to fix
>> this.
> 
> Could you go me a favor and look up where is align-c++-modes defined? 
> Or
> just paste the value of it, if it is programmatically defined. Thanks
> :-)


It's defined in lisp/align.el

Hint: You can do: git grep "align-c++-modes"

There might be other files too where adding c-ts-mode might be helpful.
A rough match would be something like 'git grep "[( ]c-mode[) ]"' (the
noise is too high, but files like lisp/progmodes/gud.el looks like a
positive candidate)


cheers,
Mohammed Sadiq

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Stefan Kangas]

Mohammed Sadiq <sadiq@sadiqpk.org> writes:

> Hint: You can do: git grep "align-c++-modes"

I like `C-x p g' or `M-x rgrep'.

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Eli Zaretskii]

> Cc: 60463@debbugs.gnu.org
> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Tue, 3 Jan 2023 11:19:09 +0000
> 
> Mohammed Sadiq <sadiq@sadiqpk.org> writes:
> 
> > Hint: You can do: git grep "align-c++-modes"
> 
> I like `C-x p g' or `M-x rgrep'.

You are kidding, right?  I expected to hear you like M-. instead
(after "M-x xref-etags-mode RET").  That's the right tool in Emacs to
look for an identifier's definition.

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Stefan Kangas]

Eli Zaretskii <eliz@gnu.org> writes:

> I expected to hear you like M-. instead (after "M-x xref-etags-mode
> RET").  That's the right tool in Emacs to look for an identifier's
> definition.

I use that too, of course.

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Yuan Fu]

Mohammed Sadiq <sadiq@sadiqpk.org> writes:

>>> Modifying align-c++-modes to include c-ts-mode should be enough to
>>> fix
>>> this.
>> Could you go me a favor and look up where is align-c++-modes
>> defined? Or
>> just paste the value of it, if it is programmatically defined. Thanks
>> :-)
>
>
> It's defined in lisp/align.el
>
> Hint: You can do: git grep "align-c++-modes"
>
> There might be other files too where adding c-ts-mode might be helpful.
> A rough match would be something like 'git grep "[( ]c-mode[) ]"' (the
> noise is too high, but files like lisp/progmodes/gud.el looks like a
> positive candidate)

Thanks, no wonder why I can’t find it in cc-xxx.el files :-)

I added ts- modes to both align and gud.

Yuan

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Mohammed Sadiq]

This now seems to work perfectly in interactive use.

Though align.el has a defun call `(c-guess-basic-syntax)` which
seems to break elisp scripts, it may have to be adapted to work
with c-ts-mode. Since we don't have to guess the syntax of the
buffer, may be we can hardcode the syntax for the buffer
depending on the ts-mode used.

I hope it won't be hard to do so

cheers,
Mohammed Sadiq

bug#60463: 29.0.60; c-ts-mode: M-x align doesn't work

[Mohammed Sadiq]

Minimal example to reproduce the said issue (save to test.el):

(let ((buffer (generate-new-buffer "temp.c")))
   (with-current-buffer buffer
     (c-ts-mode)
     (insert "int main (int argc,\nchar *argv[])")
     (align (point-min) (point-max))))

Execute the file with:
emacs -Q -batch -l test.el

Error log:
Error: wrong-type-argument (stringp nil)
   mapbacktrace(#f(compiled-function (evald func args flags) #<bytecode 
0x1a9892714fae86ab>))
   debug-early-backtrace()
   debug-early(error (wrong-type-argument stringp nil))
   looking-at(nil)
   c-guess-basic-syntax()
   #f(compiled-function () #<bytecode -0x4fad04c1216d689>)()
   align-region(1 34 "^\\s-*[{}]?\\s-*$" ((lisp-second-arg (regexp . 
"\\(^\\s-+[^( \11\n]\\|(\\(\\S-+\\)\\s-+\\)\\S-+\\(\\s-+\\)") (group . 
3) (modes . align-lisp-modes) (run-if . #f(compiled-function () 
#<bytecode 0x81a7eb0ffdc1>))) (lisp-alist-dot (regexp . 
"\\(\\s-*\\)\\.\\(\\s-*\\)") (group 1 2) (modes . align-lisp-modes)) 
(open-comment (regexp . #f(compiled-function (end reverse) #<bytecode 
-0x13267ef2968538a5>)) (modes . align-open-comment-modes)) 
(c-macro-definition (regexp . "^\\s-*#\\s-*define\\s-+\\S-+\\(\\s-+\\)") 
(modes . align-c++-modes)) (c-variable-declaration (regexp . 
"[*&0-9A-Za-z_]>?[][&*]*\\(\\s-+[*&]*\\)[A-Za-z_][][0-9A-Za-z:_]*\\s-*\\(\\()\\|=[^=\n].*\\|(.*)\\|\\(\\[.*\\]\\)*\\)\\s-*[;,]\\|)\\s-*$\\)") 
(group . 1) (modes . align-c++-modes) (justify . t) (valid . 
#f(compiled-function () #<bytecode -0x4fad04c1216d689>))) (c-assignment 
(regexp . "[^-=!^&*+<>/| 
\11\n]\\(\\s-*[-=!^&*+<>/|]*\\)=\\(\\s-*\\)\\([^= \11\n]\\|$\\)") (group 
1 2) (modes . align-c++-modes) (justify . t) (tab-stop)) 
(perl-assignment (regexp . "[^=!^&*+<>/| 
\11\n-]\\(\\s-*\\)=[~>]?\\(\\s-*\\)\\([^>= \11\n]\\|$\\)") (group 1 2) 
(modes . align-perl-modes) (tab-stop)) (python-assignment (regexp . 
"[^=!<> \11\n]\\(\\s-*\\)=\\(\\s-*\\)\\([^>= \11\n]\\|$\\)") (group 1 2) 
(modes quote (python-mode)) (tab-stop)) (make-assignment (regexp . 
"^\\s-*\\w+\\(\\s-*\\):?=\\(\\s-*\\)\\([^\11\n \\]\\|$\\)") (group 1 2) 
(modes quote (makefile-mode)) (tab-stop)) (c-comma-delimiter (regexp . 
",\\(\\s-*\\)[^/ \11\n]") (repeat . t) (modes . align-c++-modes) (run-if 
. #f(compiled-function () #<bytecode 0x81a7eb0ffdc1>))) 
(basic-comma-delimiter (regexp . ",\\(\\s-*\\)[^# \11\n]") (repeat . t) 
(modes append align-perl-modes '(python-mode)) (run-if . 
#f(compiled-function () #<bytecode 0x81a7eb0ffdc1>))) (c++-comment 
(regexp . "\\(\\s-*\\)\\(//.*\\|/\\*.*\\*/\\s-*\\)$") (modes . 
align-c++-modes) (column . comment-column) (valid . #f(compiled-function 
() #<bytecode 0x1bf81a64bd88fae1>))) (c-chain-logic (regexp . 
"\\(\\s-*\\)\\(&&\\|||\\|\\<and\\>\\|\\<or\\>\\)") (modes . 
align-c++-modes) (valid . #f(compiled-function () #<bytecode 
-0xb23a5ce0f1f5466>))) (perl-chain-logic (regexp . 
"\\(\\s-*\\)\\(&&\\|||\\|\\<and\\>\\|\\<or\\>\\)") (modes . 
align-perl-modes) (valid . #f(compiled-function () #<bytecode 
0x11a8c45291e76f7c>))) (python-chain-logic (regexp . 
"\\(\\s-*\\)\\(\\<and\\>\\|\\<or\\>\\)") (modes quote (python-mode)) 
(valid . #f(compiled-function () #<bytecode -0xb23a5ce0cced366>))) 
(c-macro-line-continuation (regexp . "\\(\\s-*\\)\\\\$") (modes . 
align-c++-modes) (column . c-backslash-column)) (basic-line-continuation 
(regexp . "\\(\\s-*\\)\\\\$") (modes quote (python-mode makefile-mode))) 
(tex-record-separator (regexp . #f(compiled-function (end reverse) 
#<bytecode 0xd4975ad92ca8cb1>)) (group 1 2) (modes . align-tex-modes) 
(repeat . t)) (tex-tabbing-separator (regexp . #f(compiled-function (end 
reverse) #<bytecode 0xd4975a5d4908a71>)) (group 1 2) (modes . 
align-tex-modes) (repeat . t) (run-if . #f(compiled-function () 
#<bytecode 0xa75a925f89192>))) (tex-record-break (regexp . 
"\\(\\s-*\\)\\\\\\\\") (modes . align-tex-modes)) (text-column (regexp . 
"\\(^\\|\\S-\\)\\([ \11]+\\)\\(\\S-\\|$\\)") (group . 2) (modes . 
align-text-modes) (repeat . t) (run-if . #f(compiled-function () 
#<bytecode -0xd0330bf7d0074c6>))) (text-dollar-figure (regexp . 
"\\$?\\(\\s-+[0-9]+\\)\\.") (modes . align-text-modes) (justify . t) 
(run-if . #f(compiled-function () #<bytecode 0xac8febf118136>))) 
(css-declaration (regexp . "^\\s-*\\(?:\\w-?\\)+:\\(\\s-*\\).*;") (group 
1) (modes quote (css-mode html-mode)))) ((exc-dq-string (regexp . 
"\"\\([^\"\n]+\\)\"") (repeat . t) (modes . align-dq-string-modes)) 
(exc-sq-string (regexp . "'\\([^'\n]+\\)'") (repeat . t) (modes . 
align-sq-string-modes)) (exc-open-comment (regexp . #f(compiled-function 
(end reverse) #<bytecode -0x13267ef2968538a5>)) (modes . 
align-open-comment-modes)) (exc-c-comment (regexp . "/\\*\\(.+\\)\\*/") 
(repeat . t) (modes . align-c++-modes)) (exc-c-func-params (regexp . 
"(\\([^)\n]+\\))") (repeat . t) (modes . align-c++-modes)) (exc-c-macro 
(regexp . "^\\s-*#\\s-*\\(if\\w*\\|endif\\)\\(.*\\)$") (group . 2) 
(modes . align-c++-modes))))
   align(1 34)
   (save-current-buffer (set-buffer buffer) (c-ts-mode) (insert "int main 
(int argc,\nchar *argv[])") (align (point-min) (point-max)))
   (let ((buffer (generate-new-buffer "temp.c"))) (save-current-buffer 
(set-buffer buffer) (c-ts-mode) (insert "int main (int argc,\nchar 
*argv[])") (align (point-min) (point-max))))
   eval-buffer(#<buffer  *load*> nil "/home/sadiq/test.el" nil t)
   load-with-code-conversion("/home/sadiq/test.el" "/home/sadiq/test.el" 
nil t)
   load("/home/sadiq/test.el" nil t)
   command-line-1(("-l" "test.el"))
   command-line()
   normal-top-level()
Wrong type argument: stringp, nil