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

Fix c-ts-common-baseline-indent-rule for lists (bug#76908)

Browse source 
* lisp/progmodes/c-ts-common.el:
(c-ts-common-baseline-indent-rule): Use the first non-comment
sibling rather than first sibling.
This commit is contained in:
Yuan Fu 2025-03-11 02:36:11 -07:00
parent abaff36c3c
commit 3b3170244d
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/progmodes/c-ts-common.el
View file

@ -37,10 +37,14 @@
;;
;; For indenting statements:
;;
;; - Set `c-ts-common-indent-offset', and
;; `c-ts-common-indent-type-regexp-alist', then use simple-indent
;; offset `c-ts-common-statement-offset' in
;; `treesit-simple-indent-rules'.
;; - Set `c-ts-common-indent-offset'. Use
;; `c-ts-common-baseline-indent-rule' as the fallback indent rule, and
;; add override rules to tweak the behavior.
;;
;; - There's also a node-level-based indentation algorithm, it's not as
;; good as `c-ts-common-baseline-indent-rule', but if you want to play
;; with it, set `c-ts-common-indent-type-regexp-alist' and use
;; `c-ts-common-statement-offset'.
;;; Code:
@ -709,6 +713,9 @@ The rule also handles method chaining like
((treesit-node-match-p (treesit-node-child parent 0)
(rx (or "(" "[")))
(let ((first-sibling (treesit-node-child parent 0 'named)))
(while (treesit-node-match-p
first-sibling c-ts-common--comment-regexp 'ignore-missing)
(setq first-sibling (treesit-node-next-sibling first-sibling 'named)))
(cond
;; Closing delimiters.
((treesit-node-match-p node (rx (or ")" "]")))