refactor(capnp, thrift): improve grammar & queries to stable for the foreseeable future

5 files changed, 26 insertions, 11 deletions

diff --git a/README.md b/README.md
index 614b00e4b..82aa283e1 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @vigoux)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @Luxed)
-- [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (experimental, maintained by @amaanq)
+- [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [clojure](https://github.com/sogaiu/tree-sitter-clojure) (maintained by @sogaiu)
 - [x] [cmake](https://github.com/uyha/tree-sitter-cmake) (maintained by @uyha)
 - [x] [comment](https://github.com/stsewd/tree-sitter-comment) (maintained by @stsewd)
diff --git a/lockfile.json b/lockfile.json
index 6b8f56560..dad63460c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -30,7 +30,7 @@
     "revision": "7175a6dd5fc1cee660dce6fe23f6043d75af424a"
   },
   "capnp": {
-    "revision": "fda654c12f29ec70309d9573bc0af16b7124384e"
+    "revision": "8e6b8561170c4767720857e3f1dec019f49c6084"
   },
   "c_sharp": {
     "revision": "a29bac0681802139710b4d3875540901504d15cb"
@@ -393,7 +393,7 @@
     "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
   },
   "thrift": {
-    "revision": "b05fca8fa29b9ecaae0cd153ba590e4b7f840819"
+    "revision": "ea322237061db4ebb879e2d53e39dab0a2f73ff2"
   },
   "tiger": {
     "revision": "a233ebe360a73a92c50978e5c4e9e471bc59ff42"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f85781e79..f8076ba75 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1202,7 +1202,6 @@ list.capnp = {
     files = { "src/parser.c" },
   },
   maintainers = { "@amaanq" },
-  experimental = true,
 }
 
 list.wgsl = {
diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index 0f6815aa6..0f2cc8525 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -1,6 +1,7 @@
 ; Preproc (?)
 
 (unique_id) @preproc
+(lang_attrs) @preproc
 
 ; Includes
 
@@ -21,10 +22,9 @@
   "enum"
   "group"
   "interface"
-  "List"
   "struct"
   "union"
-] @type.builtin
+] @keyword
 
 ; Typedefs
 
@@ -36,12 +36,17 @@
 
 ; Methods
 
+(annotation_definition_identifier) @method
 (method_identifier) @method
 
 ; Fields
 
 (field_identifier) @field
 
+; Properties
+
+(property) @property
+
 ; Parameters
 
 (param_identifier) @parameter
@@ -54,6 +59,7 @@
 ; Constants
 
 (const_identifier) @constant
+(local_const) @constant
 (enum_member) @constant
 
 ; Types
@@ -66,8 +72,8 @@
 
 ; Attributes
 
-(attribute) @attribute
 (annotation_identifier) @attribute
+(attribute) @attribute
 
 ; Operators
 
@@ -82,11 +88,14 @@
   "extends"
   "namespace"
   "using"
+  (void)
+  (annotation_target)
 ] @keyword
 
 ; Literals
 
 (string_literal) @string
+(block_text) @string
 
 (data_string) @string.special
 (namespace) @string.special
@@ -105,6 +114,7 @@
 
 [
   "*"
+  "$"
 ] @punctuation.special
 
 ["{" "}"] @punctuation.bracket
@@ -119,6 +129,8 @@
   "->"
 ] @punctuation.delimiter
 
+(data_hex) @symbol
+
 ; Comments
 
 (comment) @comment @spell
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index d06fbe03f..f5d8a7ef3 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -1,6 +1,6 @@
 ; Namespace
 
-(namespace) @namespace
+(namespace_definition) @namespace
 
 ; Includes
 
@@ -47,14 +47,17 @@
 ; Types
 
 (enum_identifier) @type
+(definition_type) @type
 (exception_identifier) @type
 (exception_param_type) @type
 (field_type) @type
+(param_type) @type
 (type_identifier) @type
 
 ; Attributes
 
 (annotation_identifier) @attribute
+(uri_def) @attribute
 
 ; Operators
 
@@ -62,7 +65,6 @@
  "="
  "+"
  "-"
- "&"
 ] @operator
 
 ; Exceptions
@@ -113,12 +115,13 @@
   "xsd_optional"
 ] @keyword
 
-(namespace_scope) @namespace
 
 ; Literals
 
 (string_literal) @string
 
+(uri) @string.special
+
 (number) @number
 
 (double) @float
@@ -127,7 +130,7 @@
 
 ; Typedefs
 (typedef_definition) @type.definition
-(namespace_definition) @type.definition
+(namespace_scope) @type.definition
 
 ; Misc
 
@@ -137,6 +140,7 @@
 
 [
   "*"
+  "&"
 ] @punctuation.special
 
 (field_modifier) @attribute