From 641f78fcaa31fd7946ce7bf65f978c0d0e2b8fb8 Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Tue, 11 Mar 2025 02:36:11 -0700 Subject: [PATCH] Fix c-ts-common-baseline-indent-rule for lists (bug#76908) * lisp/progmodes/c-ts-common.el: (c-ts-common-baseline-indent-rule): Use the first non-comment sibling rather than first sibling. (cherry picked from commit 3b3170244da44d3d0d76139b138df65ea6adc064) --- lisp/progmodes/c-ts-common.el | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el index 3c363826664..516d5f9b722 100644 --- a/lisp/progmodes/c-ts-common.el +++ b/lisp/progmodes/c-ts-common.el @@ -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 ")" "]"))) -- 2.39.5