A couple of bug fixes

.github/workflows/ci.yml

@@ -32,8 +32,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Set up the repo
-        uses: tree-sitter/setup-action/cli@v1
+      - name: Set up tree-sitter
+        uses: tree-sitter/setup-action/cli@v2
       - name: Set up examples
         run: |-
           git clone https://github.com/numpy/numpy examples/numpy --single-branch --depth=1 --filter=blob:none

grammar.js

@@ -359,10 +359,10 @@ module.exports = grammar({
     except_clause: $ => seq(
       'except',
       optional(seq(
-        $.expression,
+        field('value', $.expression),
         optional(seq(
           choice('as', ','),
-          $.expression,
+          field('alias', $.expression),
         )),
       )),
       ':',
@@ -943,15 +943,21 @@ module.exports = grammar({
     )),
 
     type: $ => choice(
-      $.expression,
+      prec(1, $.expression),
       $.splat_type,
       $.generic_type,
       $.union_type,
       $.constrained_type,
       $.member_type,
     ),
     splat_type: $ => prec(1, seq(choice('*', '**'), $.identifier)),
-    generic_type: $ => prec(1, seq($.identifier, $.type_parameter)),
+    generic_type: $ => prec(1, seq(
+      choice(
+        $.identifier,
+        alias('type', $.identifier),
+      ),
+      $.type_parameter,
+    )),
     union_type: $ => prec.left(seq($.type, '|', $.type)),
     constrained_type: $ => prec.right(seq($.type, ':', $.type)),
     member_type: $ => seq($.type, '.', $.identifier),