[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 7292b24c801 1/3: Fix c-ts-mode indentation
From: |
Yuan Fu |
Subject: |
emacs-29 7292b24c801 1/3: Fix c-ts-mode indentation |
Date: |
Sun, 5 Mar 2023 18:26:57 -0500 (EST) |
branch: emacs-29
commit 7292b24c80143d697870a670963f136db375580b
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Fix c-ts-mode indentation
Not the subject of it, but mentioned in bug#61893.
* lisp/progmodes/c-ts-mode.el (c-ts-mode--anchor-prev-sibling): Skip
the sibling if it doesn't start on it's own line.
* test/lisp/progmodes/c-ts-mode-resources/indent.erts: New test.
---
lisp/progmodes/c-ts-mode.el | 30 ++++++++++++++--------
.../lisp/progmodes/c-ts-mode-resources/indent.erts | 16 ++++++++++++
2 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index f40bbc57eb5..ee4a3bb2de0 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -284,17 +284,25 @@ PARENT and BOL are like other anchor functions."
(treesit-node-first-child-for-pos parent bol) t)
(treesit-node-child parent -1 t)))
(continue t))
- (while (and prev-sibling continue)
- (pcase (treesit-node-type prev-sibling)
- ;; Get the statement in the label.
- ("labeled_statement"
- (setq prev-sibling (treesit-node-child prev-sibling 2)))
- ;; Get the last statement in the preproc. Tested by
- ;; "Prev-Sibling When Prev-Sibling is Preproc" test.
- ((or "preproc_if" "preproc_ifdef" "preproc_elif" "preproc_else")
- (setq prev-sibling (treesit-node-child prev-sibling -2)))
- ;; Don't do anything special.
- (_ (setq continue nil))))
+ (save-excursion
+ (while (and prev-sibling continue)
+ (pcase (treesit-node-type prev-sibling)
+ ;; Get the statement in the label.
+ ("labeled_statement"
+ (setq prev-sibling (treesit-node-child prev-sibling 2)))
+ ;; Get the last statement in the preproc. Tested by
+ ;; "Prev-Sibling When Prev-Sibling is Preproc" test.
+ ((or "preproc_if" "preproc_ifdef" "preproc_elif" "preproc_else")
+ (setq prev-sibling (treesit-node-child prev-sibling -2)))
+ ;; If the start of the previous sibling isn't at the
+ ;; beginning of a line, something's probably not quite
+ ;; right, go a step further.
+ (_ (goto-char (treesit-node-start prev-sibling))
+ (if (looking-back (rx bol (* whitespace))
+ (line-beginning-position))
+ (setq continue nil)
+ (setq prev-sibling
+ (treesit-node-prev-sibling prev-sibling)))))))
;; This could be nil if a) there is no prev-sibling or b)
;; prev-sibling doesn't have a child.
(treesit-node-start prev-sibling)))
diff --git a/test/lisp/progmodes/c-ts-mode-resources/indent.erts
b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
index 904c6498cb5..77bfeb5ad6e 100644
--- a/test/lisp/progmodes/c-ts-mode-resources/indent.erts
+++ b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
@@ -402,3 +402,19 @@ int main()
|
}
=-=-=
+
+Name: Prev-Sibling But Not Trailing Comment
+
+=-=
+static int
+required_matrix_height (struct window *w)
+{
+#ifdef HAVE_WINDOW_SYSTEM
+ if (FRAME_WINDOW_P (f))
+ {
+ return 0;
+ }
+#endif /* Don't align to this comment. */
+ |
+}
+=-=-=