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

Recognize functions and macros as defuns in 'cmake-ts-mode'

Browse source 
* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--function-name):
Renamed to 'cmake-ts-mode--defun-name' since the function handles
now functions and macros.
(cmake-ts-mode--defun-name): Return text of the first 'argument'
node below 'function_def' and 'macro_def' nodes.
(cmake-ts-mode): Set up treesit-defun-type-regexp and
'treesit-defun-name-function'.  Change the imenu setup to
recognize macros too.  Since we have set up
'treesit-defun-name-function', we don't have to
pass 'cmake-ts-mode--function-name' anymore.  (Bug#69186)

To make `treesit-defun-at-point' work properly, we have to recognize
function_def/macro_def nodes, not the lower-level *_command nodes.
This commit is contained in:
Jörg Bornemann 2024-02-17 21:18:02 +01:00 • committed by Eli Zaretskii
parent 8e0f134653
commit 6b6761d534
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/progmodes/cmake-ts-mode.el
View file

@ -193,13 +193,13 @@ Check if a node type is available, then return the right font lock rules."
'((ERROR) @font-lock-warning-face))
"Tree-sitter font-lock settings for `cmake-ts-mode'.")
(defun cmake-ts-mode--function-name (node)
"Return the function name of NODE.
Return nil if there is no name or if NODE is not a function node."
(defun cmake-ts-mode--defun-name (node)
"Return the defun name of NODE.
Return nil if there is no name or if NODE is not a defun node."
(pcase (treesit-node-type node)
("function_command"
((or "function_def" "macro_def")
(treesit-node-text
(treesit-search-subtree node "^argument$" nil nil 2)
(treesit-search-subtree node "^argument$" nil nil 3)
t))))
;;;###autoload
@ -216,9 +216,15 @@ Return nil if there is no name or if NODE is not a function node."
(setq-local comment-end "")
(setq-local comment-start-skip (rx "#" (* (syntax whitespace))))
;; Defuns.
(setq-local treesit-defun-type-regexp (rx (or "function" "macro")
"_def"))
(setq-local treesit-defun-name-function #'cmake-ts-mode--defun-name)
;; Imenu.
(setq-local treesit-simple-imenu-settings
`(("Function" "\\`function_command\\'" nil cmake-ts-mode--function-name)))
`(("Function" "^function_def$")
("Macro" "^macro_def$")))
(setq-local which-func-functions nil)
;; Indent.