Add type fields

queries/highlights.scm

@@ -16,12 +16,11 @@
 
 [
   (implicit_type)
-  (nullable_type)
-  (pointer_type)
-  (function_pointer_type)
   (predefined_type)
 ] @type.builtin
 
+(_ type: (identifier) @type)
+
 ;; Enum
 (enum_member_declaration (identifier) @property.definition)
 
@@ -187,19 +186,15 @@
 (prefix_unary_expression (identifier) @variable)
 (postfix_unary_expression (identifier)* @variable)
 (assignment_expression (identifier) @variable)
-(cast_expression (identifier) @type (identifier) @variable)
+(cast_expression (_) (identifier) @variable)
 
 ;; Class
-(base_list (identifier) @type)
 (property_declaration (generic_name))
 (property_declaration
-  type: (nullable_type) @type
   name: (identifier) @variable)
 (property_declaration
-  type: (predefined_type) @type
   name: (identifier) @variable)
 (property_declaration
-  type: (identifier) @type
   name: (identifier) @variable)
 
 ;; Lambda
@@ -210,16 +205,11 @@
 
 ;; Parameter
 (parameter
-  type: (identifier) @type
   name: (identifier) @variable.parameter)
 (parameter (identifier) @variable.parameter)
 (parameter_modifier) @keyword
 
-;; Typeof
-(type_of_expression (identifier) @type)
-
 ;; Variable
-(variable_declaration (identifier) @type)
 (variable_declarator (identifier) @variable)
 
 ;; Return
@@ -229,15 +219,14 @@
 ;; Type
 (generic_name (identifier) @type)
 (type_parameter (identifier) @property.definition)
-(type_argument_list (identifier) @type)
+(as_expression right: (identifier) @type)
+(is_expression right: (identifier) @type)
 
 ;; Type constraints
 (type_parameter_constraints_clause (identifier) @property.definition)
-(type_constraint (identifier) @type)
 
 ;; Exception
-(catch_declaration (identifier) @type (identifier) @variable)
-(catch_declaration (identifier) @type)
+(catch_declaration (_) (identifier) @variable)
 
 ;; Switch
 (switch_statement (identifier) @variable)

test/highlight/baseline.cs

@@ -167,7 +167,7 @@ public partial class Class<in TParam> where TParam : class?, notnull, F?
     //                                                        ^ operator
     //                                                           ^ keyword
     //                                                                  ^ punctuation.delimiter
-    //                                                                    ^ type.builtin
+    //                                                                    ^ type
     //                                                                     ^ operator
     {
     // <- punctuation.bracket

test/highlight/types.cs

@@ -0,0 +1,45 @@
+class A
+{
+    public void M()
+    {
+        int a;
+        // <- type.builtin
+        var a;
+        // <- type.builtin
+
+        int? a;
+        // <- type.builtin
+        // ^ operator
+        A? a;
+        // <- type
+         // <- operator
+
+        int* a;
+        // <- type.builtin
+        // ^ operator
+        A* a;
+        // <- type
+         // <- operator
+
+        ref A* a;
+        // <- keyword
+        //  ^ type
+        //   ^ operator
+
+        var a = x is int;
+        //           ^ type.builtin
+        var a = x is A;
+        //           ^
+
+        var a = x as int;
+        //           ^ type.builtin
+        var a = x as A;
+        //           ^ type
+
+        var a = (int)x;
+        //       ^ type.builtin
+        var a = (A)x;
+        //       ^ type
+    }
+
+}