procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve c-ts-mode block comment indent (bug#60270)

Browse source 
Now it handles stuff like

/**
 * @some_func:
 * @arg1:
 */

* lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-styles): Use new
matcher and anchor.
(c-ts-mode--looking-at-star): New matcher.
(c-ts-mode--comment-start-after-first-star): New anchor.
This commit is contained in:
Yuan Fu 2022-12-24 00:15:48 -08:00
parent e30621caa2
commit e4e3634539
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/progmodes/c-ts-mode.el
View file

@ -102,7 +102,8 @@ MODE is either `c' or `cpp'."
((node-is "else") parent-bol 0) ((node-is "else") parent-bol 0)
((node-is "case") parent-bol 0) ((node-is "case") parent-bol 0)
((node-is "preproc_arg") no-indent) ((node-is "preproc_arg") no-indent)
((and (parent-is "comment") comment-end) comment-start -1) ((and (parent-is "comment") c-ts-mode--looking-at-star)
c-ts-mode--comment-start-after-first-star -1)
((parent-is "comment") prev-adaptive-prefix 0) ((parent-is "comment") prev-adaptive-prefix 0)
((node-is "labeled_statement") parent-bol 0) ((node-is "labeled_statement") parent-bol 0)
((parent-is "labeled_statement") parent-bol c-ts-mode-indent-offset) ((parent-is "labeled_statement") parent-bol c-ts-mode-indent-offset)
@ -168,6 +169,24 @@ MODE is either `c' or `cpp'."
('linux (alist-get 'linux (c-ts-mode--indent-styles mode))))))) ('linux (alist-get 'linux (c-ts-mode--indent-styles mode)))))))
`((,mode ,@style)))) `((,mode ,@style))))
(defun c-ts-mode--looking-at-star (&rest _)
"A tree-sitter simple indent matcher.
Matches if there is a \"*\" after point (ignoring whitespace in
between)."
(looking-at (rx (* (syntax whitespace)) "*")))
(defun c-ts-mode--comment-start-after-first-star (_n parent &rest _)
"A tree-sitter simple indent anchor.
Finds the \"/*\" and returns the point after the \"*\".
Assumes PARENT is a comment node."
(save-excursion
(goto-char (treesit-node-start parent))
(if (looking-at (rx "/*"))
(match-end 0)
(point))))
;;; Font-lock
(defvar c-ts-mode--preproc-keywords (defvar c-ts-mode--preproc-keywords
'("#define" "#if" "#ifdef" "#ifndef" '("#define" "#if" "#ifdef" "#ifndef"
"#else" "#elif" "#endif" "#include") "#else" "#elif" "#endif" "#include")