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

Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29

Browse source
This commit is contained in:
Eli Zaretskii 2022-12-29 11:11:58 +02:00
commit 9371d488be
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ MODE is either `c' or `cpp'."
`(((parent-is "translation_unit") parent-bol 0) `(((parent-is "translation_unit") parent-bol 0)
((node-is ")") parent 1) ((node-is ")") parent 1)
((node-is "]") parent-bol 0) ((node-is "]") parent-bol 0)
((node-is "}") (and parent parent-bol) 0) ((node-is "}") c-ts-mode--bracket-children-anchor 0)
((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)
@ -133,7 +133,8 @@ MODE is either `c' or `cpp'."
((match "#endif" "preproc_if") point-min 0) ((match "#endif" "preproc_if") point-min 0)
((match "preproc_function_def" "compound_statement") point-min 0) ((match "preproc_function_def" "compound_statement") point-min 0)
((match "preproc_call" "compound_statement") point-min 0) ((match "preproc_call" "compound_statement") point-min 0)
((parent-is "compound_statement") (and parent parent-bol) c-ts-mode-indent-offset) ((parent-is "compound_statement")
c-ts-mode--bracket-children-anchor c-ts-mode-indent-offset)
((parent-is "function_definition") parent-bol 0) ((parent-is "function_definition") parent-bol 0)
((parent-is "conditional_expression") first-sibling 0) ((parent-is "conditional_expression") first-sibling 0)
((parent-is "assignment_expression") parent-bol c-ts-mode-indent-offset) ((parent-is "assignment_expression") parent-bol c-ts-mode-indent-offset)
@ -189,6 +190,21 @@ 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--bracket-children-anchor (_n parent &rest _)
"This anchor is used for children of a compound_statement.
So anything inside a {} block. PARENT should be the
compound_statement. This anchor looks at the {, if itson its own
line, anchor at it, if it has stuff before it, anchor at the
beginning of grandparent."
(save-excursion
(goto-char (treesit-node-start parent))
(let ((bol (line-beginning-position)))
(skip-chars-backward " \t")
(treesit-node-start
(if (< bol (point))
(treesit-node-parent parent)
parent)))))
(defun c-ts-mode--looking-at-star (&rest _) (defun c-ts-mode--looking-at-star (&rest _)
"A tree-sitter simple indent matcher. "A tree-sitter simple indent matcher.
Matches if there is a \"*\" after point (ignoring whitespace in Matches if there is a \"*\" after point (ignoring whitespace in