diff options
| author | John Drouhard <john@drouhard.dev> | 2023-03-26 13:32:22 -0500 |
|---|---|---|
| committer | Amaan Qureshi <amaanq12@gmail.com> | 2023-03-27 10:20:38 -0400 |
| commit | 300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b (patch) | |
| tree | 07621830f7a1f39f20e2b902d595a1ed25f33b98 | |
| parent | feat(scala): add in local variables queries (diff) | |
| download | nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.tar nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.tar.gz nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.tar.bz2 nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.tar.lz nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.tar.xz nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.tar.zst nvim-treesitter-300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b.zip | |
feat(cpp): simplify namespace query rules now that parser is a bit more consistent
| -rw-r--r-- | lockfile.json | 2 | ||||
| -rw-r--r-- | queries/cpp/highlights.scm | 5 | ||||
| -rw-r--r-- | queries/cpp/locals.scm | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lockfile.json b/lockfile.json index b969536d9..5ce70288e 100644 --- a/lockfile.json +++ b/lockfile.json @@ -63,7 +63,7 @@ "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591" }, "cpp": { - "revision": "03fa93db133d6048a77d4de154a7b17ea8b9d076" + "revision": "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74" }, "css": { "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm index c40ab26f1..854e03cb3 100644 --- a/queries/cpp/highlights.scm +++ b/queries/cpp/highlights.scm @@ -45,12 +45,9 @@ (namespace_identifier) @namespace ((namespace_identifier) @type (#lua-match? @type "^[A-Z]")) -((namespace_identifier) @constant - (#lua-match? @constant "^[A-Z][A-Z_0-9]*$")) + (case_statement value: (qualified_identifier (identifier) @constant)) -(namespace_definition - name: (identifier) @namespace) (using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @namespace) diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm index c48a7cc39..4c114876c 100644 --- a/queries/cpp/locals.scm +++ b/queries/cpp/locals.scm @@ -39,7 +39,11 @@ ;; Namespaces (namespace_definition - name: (identifier) @definition.namespace + name: (namespace_identifier) @definition.namespace + body: (_) @scope) + +(namespace_definition + name: (nested_namespace_specifier) @definition.namespace body: (_) @scope) ((namespace_identifier) @reference |