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

Support namespaces in c++-ts-mode (bug#60397)

Browse source 
Not a complete fix.  See the next commit.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-styles): Add rules.
(c-ts-mode--defun-name): Add namespace_definition.
(c-ts-base-mode): Add namespace_definition to
treesit-defun-type-regexp.
This commit is contained in:
Yuan Fu 2023-01-07 15:45:05 -08:00
parent 757c2c2592
commit 7c356934fb
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,9 @@ MODE is either `c' or `cpp'."
((parent-is "call_expression") parent 0)
((parent-is "enumerator_list") parent-bol c-ts-mode-indent-offset)
,@(when (eq mode 'cpp)
'(((node-is "access_specifier") parent-bol 0)))
'(((node-is "access_specifier") parent-bol 0)
;; Indent the body of namespace definitions.
((parent-is "declaration_list") parent-bol c-ts-mode-indent-offset)))
((parent-is "field_declaration_list") parent-bol c-ts-mode-indent-offset)
((parent-is "initializer_list") parent-bol c-ts-mode-indent-offset)
((parent-is "if_statement") parent-bol c-ts-mode-indent-offset)
@ -538,7 +540,8 @@ Return nil if NODE is not a defun node or doesn't have a name."
(c-ts-mode--declarator-identifier
(treesit-node-child-by-field-name node "declarator")))
((or "struct_specifier" "enum_specifier"
"union_specifier" "class_specifier")
"union_specifier" "class_specifier"
"namespace_definition")
(treesit-node-child-by-field-name node "name")))
t))
@ -743,7 +746,8 @@ Set up:
"struct_specifier"
"enum_specifier"
"union_specifier"
"class_specifier"))
"class_specifier"
"namespace_definition"))
#'c-ts-mode--defun-valid-p))
(setq-local treesit-defun-skipper #'c-ts-mode--defun-skipper)
(setq-local treesit-defun-name-function #'c-ts-mode--defun-name)