Merge remote-tracking branch 'github/master'

.github/workflows/ci.yml

@@ -49,8 +49,12 @@ jobs:
         with:
           files: |
             examples/**/*.py
+            !examples/cpython/Lib/test/test_annotationlib.py
+            !examples/cpython/Lib/test/test_type_params.py
             !examples/cpython/Lib/test/test_compile.py
             !examples/cpython/Tools/build/generate_re_casefix.py
+            !examples/cpython/Lib/test/test_annotationlib.py
+            !examples/cpython/Lib/test/test_type_params.py
           invalid-files: |
             examples/cpython/Lib/test/tokenizedata/badsyntax_3131.py
   fuzz:

grammar.js

@@ -56,6 +56,7 @@ module.exports = grammar({
     [$.named_expression, $.as_pattern],
     [$.print_statement, $.primary_expression],
     [$.type_alias_statement, $.primary_expression],
+    [$.match_statement, $.primary_expression],
   ],
 
   supertypes: $ => [
@@ -806,6 +807,10 @@ module.exports = grammar({
       field('argument', $.primary_expression),
     )),
 
+    _not_in: _ => seq('not', 'in'),
+
+    _is_not: _ => seq('is', 'not'),
+
     comparison_operator: $ => prec.left(PREC.compare, seq(
       $.primary_expression,
       repeat1(seq(
@@ -819,9 +824,9 @@ module.exports = grammar({
             '>',
             '<>',
             'in',
-            alias(seq('not', 'in'), 'not in'),
+            alias($._not_in, 'not in'),
             'is',
-            alias(seq('is', 'not'), 'is not'),
+            alias($._is_not, 'is not'),
           )),
         $.primary_expression,
       )),
@@ -1171,11 +1176,13 @@ module.exports = grammar({
           'exec',
           'async',
           'await',
-          'match',
         ),
         $.identifier,
       )),
-      alias('type', $.identifier),
+      alias(
+        choice('type', 'match'),
+        $.identifier,
+      ),
     ),
 
     true: _ => 'True',

queries/highlights.scm

@@ -96,6 +96,8 @@
   "is"
   "not"
   "or"
+  "is not"
+  "not in"
 ] @operator
 
 [