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

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

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