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

Fix c-ts-mode indentation

Browse source 
Mentioned in bug#61893, although not the subject of it.

* lisp/progmodes/c-ts-mode.el:
(c-ts-mode--anchor-prev-sibling): Fix the child index for preproc_else
and preproc_elif case.
* test/lisp/progmodes/c-ts-mode-resources/indent-preproc.erts:
New test.
This commit is contained in:
Yuan Fu 2023-03-05 15:07:58 -08:00
parent 7292b24c80
commit d724d7d678
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -292,8 +292,10 @@ PARENT and BOL are like other anchor functions."
(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")
((or "preproc_if" "preproc_ifdef")
(setq prev-sibling (treesit-node-child prev-sibling -2)))
((or "preproc_elif" "preproc_else")
(setq prev-sibling (treesit-node-child prev-sibling -1)))
;; 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.

16
test/lisp/progmodes/c-ts-mode-resources/indent-preproc.erts
View file

@ -78,3 +78,19 @@ free_glyph_pool (struct glyph_pool *pool)
}
}
=-=-=
Name: Prev-Sibling Plus Preproc
=-=-=
int main() {
#ifdef MSDOS
f->output_data.tty = &the_only_tty_output;
f->output_data.tty->display_info = &the_only_display_info;
#else
if (f->output_method == output_termcap)
create_tty_output (f);
#endif
t->display_info.tty->top_frame = selected_frame;
change_frame_size ();
}
=-=-=