feat(cpp): simplify namespace query rules now that parser is a bit more consistent

This commit is contained in:
John Drouhard 2023-03-26 13:32:22 -05:00 committed by Amaan Qureshi
parent 25dd24ed0e
commit 300ba8d5a5
3 changed files with 7 additions and 6 deletions

View file

@ -63,7 +63,7 @@
"revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591" "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
}, },
"cpp": { "cpp": {
"revision": "03fa93db133d6048a77d4de154a7b17ea8b9d076" "revision": "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"
}, },
"css": { "css": {
"revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"

View file

@ -45,12 +45,9 @@
(namespace_identifier) @namespace (namespace_identifier) @namespace
((namespace_identifier) @type ((namespace_identifier) @type
(#lua-match? @type "^[A-Z]")) (#lua-match? @type "^[A-Z]"))
((namespace_identifier) @constant
(#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
(case_statement (case_statement
value: (qualified_identifier (identifier) @constant)) value: (qualified_identifier (identifier) @constant))
(namespace_definition
name: (identifier) @namespace)
(using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @namespace) (using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @namespace)

View file

@ -39,7 +39,11 @@
;; Namespaces ;; Namespaces
(namespace_definition (namespace_definition
name: (identifier) @definition.namespace name: (namespace_identifier) @definition.namespace
body: (_) @scope)
(namespace_definition
name: (nested_namespace_specifier) @definition.namespace
body: (_) @scope) body: (_) @scope)
((namespace_identifier) @reference ((namespace_identifier) @reference