diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
index afb32a6d..d837d6a3 100644
--- a/grammars/MagicPython.cson
+++ b/grammars/MagicPython.cson
@@ -308,6 +308,18 @@ repository:
         name: "storage.type.class.python"
         match: "\\b(?<!\\.)(class)\\b"
       }
+      {
+        match: '''
+          (?x)
+            ^\\s*(
+              case | match
+            )(?=\\s*([-+\\w\\d(\\[{'":#]|$))\\b
+          
+        '''
+        captures:
+          "1":
+            name: "keyword.control.flow.python"
+      }
     ]
   "expression-bare":
     comment: "valid Python expressions w/o comments and line continuation"
@@ -1826,14 +1838,14 @@ repository:
         match: '''
           (?x)
             (?<!\\.) \\b(
-              __import__ | abs | all | any | ascii | bin | breakpoint | callable
-              | chr | compile | copyright | credits | delattr | dir | divmod
-              | enumerate | eval | exec | exit | filter | format | getattr
-              | globals | hasattr | hash | help | hex | id | input
-              | isinstance | issubclass | iter | len | license | locals | map
-              | max | memoryview | min | next | oct | open | ord | pow | print
-              | quit | range | reload | repr | reversed | round
-              | setattr | sorted | sum | vars | zip
+              __import__ | abs | aiter | all | any | anext | ascii | bin
+              | breakpoint | callable | chr | compile | copyright | credits
+              | delattr | dir | divmod | enumerate | eval | exec | exit
+              | filter | format | getattr | globals | hasattr | hash | help
+              | hex | id | input | isinstance | issubclass | iter | len
+              | license | locals | map | max | memoryview | min | next
+              | oct | open | ord | pow | print | quit | range | reload | repr
+              | reversed | round | setattr | sorted | sum | vars | zip
             )\\b
           
         '''
@@ -1876,24 +1888,29 @@ repository:
       (?x)
         \\b(
           __(?:
-            abs | add | aenter | aexit | aiter | and | anext | await
-            | bool | call | ceil | cmp | coerce | complex | contains
-            | copy | deepcopy | del | delattr | delete | delitem
-            | delslice | dir | div | divmod | enter | eq | exit | float
-            | floor | floordiv | format | ge | get | getattr
-            | getattribute | getinitargs | getitem | getnewargs
-            | getslice | getstate | gt | hash | hex | iadd | iand | idiv
-            | ifloordiv | ilshift | imod | imul | index | init
-            | instancecheck | int | invert | ior | ipow | irshift | isub
-            | iter | itruediv | ixor | le | len | long | lshift | lt
-            | missing | mod | mul | ne | neg | new | next | nonzero | oct | or
-            | pos | pow | radd | rand | rdiv | rdivmod | reduce
-            | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod
-            | rmul | ror | round | rpow | rrshift | rshift | rsub
-            | rtruediv | rxor | set | setattr | setitem | setslice
-            | setstate | sizeof | str | sub | subclasscheck | truediv
-            | trunc | unicode | xor | matmul | rmatmul | imatmul
-            | init_subclass | set_name | fspath | bytes | prepare
+            abs | add | aenter | aexit | aiter | and | anext
+            | await | bool | call | ceil | class_getitem
+            | cmp | coerce | complex | contains | copy
+            | deepcopy | del | delattr | delete | delitem
+            | delslice | dir | div | divmod | enter | eq
+            | exit | float | floor | floordiv | format | ge
+            | get | getattr | getattribute | getinitargs
+            | getitem | getnewargs | getslice | getstate | gt
+            | hash | hex | iadd | iand | idiv | ifloordiv |
+            | ilshift | imod | imul | index | init
+            | instancecheck | int | invert | ior | ipow
+            | irshift | isub | iter | itruediv | ixor | le
+            | len | long | lshift | lt | missing | mod | mul
+            | ne | neg | new | next | nonzero | oct | or | pos
+            | pow | radd | rand | rdiv | rdivmod | reduce
+            | reduce_ex | repr | reversed | rfloordiv |
+            | rlshift | rmod | rmul | ror | round | rpow
+            | rrshift | rshift | rsub | rtruediv | rxor | set
+            | setattr | setitem | set_name | setslice
+            | setstate | sizeof | str | sub | subclasscheck
+            | truediv | trunc | unicode | xor | matmul
+            | rmatmul | imatmul | init_subclass | set_name
+            | fspath | bytes | prepare | length_hint
           )__
         )\\b
       
@@ -1907,12 +1924,12 @@ repository:
       (?x)
         \\b(
           __(?:
-            all | bases | builtins | class | class_getitem | code | debug
-            | defaults | dict | doc | file | func | kwdefaults | members
-            | metaclass | methods | module | mro | mro_entries | name
-            | qualname | post_init | self | signature | slots | subclasses
-            | version | weakref | wrapped | annotations | classcell
-            | spec | path | package | future | traceback
+            all | annotations | bases | builtins | class
+            | closure | code | debug | defaults | dict | doc | file | func
+            | globals | kwdefaults | match_args | members | metaclass | methods
+            | module | mro | mro_entries | name | qualname | post_init | self
+            | signature | slots | subclasses | version | weakref | wrapped
+            | classcell | spec | path | package | future | traceback
           )__
         )\\b
       
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
index a3f1bd2b..a1c3f8e7 100644
--- a/grammars/MagicPython.tmLanguage
+++ b/grammars/MagicPython.tmLanguage
@@ -471,6 +471,22 @@ it's probably control flow like:
             <key>match</key>
             <string>\b(?&lt;!\.)(class)\b</string>
           </dict>
+          <dict>
+            <key>match</key>
+            <string>(?x)
+  ^\s*(
+    case | match
+  )(?=\s*([-+\w\d(\[{'":#]|$))\b
+</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.control.flow.python</string>
+              </dict>
+            </dict>
+          </dict>
         </array>
       </dict>
       <key>expression-bare</key>
@@ -2852,14 +2868,14 @@ correctly identify the "in" as a control flow keyword.
             <key>match</key>
             <string>(?x)
   (?&lt;!\.) \b(
-    __import__ | abs | all | any | ascii | bin | breakpoint | callable
-    | chr | compile | copyright | credits | delattr | dir | divmod
-    | enumerate | eval | exec | exit | filter | format | getattr
-    | globals | hasattr | hash | help | hex | id | input
-    | isinstance | issubclass | iter | len | license | locals | map
-    | max | memoryview | min | next | oct | open | ord | pow | print
-    | quit | range | reload | repr | reversed | round
-    | setattr | sorted | sum | vars | zip
+    __import__ | abs | aiter | all | any | anext | ascii | bin
+    | breakpoint | callable | chr | compile | copyright | credits
+    | delattr | dir | divmod | enumerate | eval | exec | exit
+    | filter | format | getattr | globals | hasattr | hash | help
+    | hex | id | input | isinstance | issubclass | iter | len
+    | license | locals | map | max | memoryview | min | next
+    | oct | open | ord | pow | print | quit | range | reload | repr
+    | reversed | round | setattr | sorted | sum | vars | zip
   )\b
 </string>
           </dict>
@@ -2904,24 +2920,29 @@ indirectly through syntactic constructs
         <string>(?x)
   \b(
     __(?:
-      abs | add | aenter | aexit | aiter | and | anext | await
-      | bool | call | ceil | cmp | coerce | complex | contains
-      | copy | deepcopy | del | delattr | delete | delitem
-      | delslice | dir | div | divmod | enter | eq | exit | float
-      | floor | floordiv | format | ge | get | getattr
-      | getattribute | getinitargs | getitem | getnewargs
-      | getslice | getstate | gt | hash | hex | iadd | iand | idiv
-      | ifloordiv | ilshift | imod | imul | index | init
-      | instancecheck | int | invert | ior | ipow | irshift | isub
-      | iter | itruediv | ixor | le | len | long | lshift | lt
-      | missing | mod | mul | ne | neg | new | next | nonzero | oct | or
-      | pos | pow | radd | rand | rdiv | rdivmod | reduce
-      | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod
-      | rmul | ror | round | rpow | rrshift | rshift | rsub
-      | rtruediv | rxor | set | setattr | setitem | setslice
-      | setstate | sizeof | str | sub | subclasscheck | truediv
-      | trunc | unicode | xor | matmul | rmatmul | imatmul
-      | init_subclass | set_name | fspath | bytes | prepare
+      abs | add | aenter | aexit | aiter | and | anext
+      | await | bool | call | ceil | class_getitem
+      | cmp | coerce | complex | contains | copy
+      | deepcopy | del | delattr | delete | delitem
+      | delslice | dir | div | divmod | enter | eq
+      | exit | float | floor | floordiv | format | ge
+      | get | getattr | getattribute | getinitargs
+      | getitem | getnewargs | getslice | getstate | gt
+      | hash | hex | iadd | iand | idiv | ifloordiv |
+      | ilshift | imod | imul | index | init
+      | instancecheck | int | invert | ior | ipow
+      | irshift | isub | iter | itruediv | ixor | le
+      | len | long | lshift | lt | missing | mod | mul
+      | ne | neg | new | next | nonzero | oct | or | pos
+      | pow | radd | rand | rdiv | rdivmod | reduce
+      | reduce_ex | repr | reversed | rfloordiv |
+      | rlshift | rmod | rmul | ror | round | rpow
+      | rrshift | rshift | rsub | rtruediv | rxor | set
+      | setattr | setitem | set_name | setslice
+      | setstate | sizeof | str | sub | subclasscheck
+      | truediv | trunc | unicode | xor | matmul
+      | rmatmul | imatmul | init_subclass | set_name
+      | fspath | bytes | prepare | length_hint
     )__
   )\b
 </string>
@@ -2942,12 +2963,12 @@ indirectly through syntactic constructs
         <string>(?x)
   \b(
     __(?:
-      all | bases | builtins | class | class_getitem | code | debug
-      | defaults | dict | doc | file | func | kwdefaults | members
-      | metaclass | methods | module | mro | mro_entries | name
-      | qualname | post_init | self | signature | slots | subclasses
-      | version | weakref | wrapped | annotations | classcell
-      | spec | path | package | future | traceback
+      all | annotations | bases | builtins | class
+      | closure | code | debug | defaults | dict | doc | file | func
+      | globals | kwdefaults | match_args | members | metaclass | methods
+      | module | mro | mro_entries | name | qualname | post_init | self
+      | signature | slots | subclasses | version | weakref | wrapped
+      | classcell | spec | path | package | future | traceback
     )__
   )\b
 </string>
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
index bd740829..ebfccdaf 100644
--- a/grammars/src/MagicPython.syntax.yaml
+++ b/grammars/src/MagicPython.syntax.yaml
@@ -313,6 +313,13 @@ repository:
             )\b
       - name: storage.type.class.python
         match: \b(?<!\.)(class)\b
+      - match: |
+          (?x)
+            ^\s*(
+              case | match
+            )(?=\s*([-+\w\d(\[{'":#]|$))\b
+        captures:
+          '1': {name: keyword.control.flow.python}
 
   expression-bare:
     comment: valid Python expressions w/o comments and line continuation
@@ -1284,14 +1291,14 @@ repository:
         match: |
           (?x)
             (?<!\.) \b(
-              __import__ | abs | all | any | ascii | bin | breakpoint | callable
-              | chr | compile | copyright | credits | delattr | dir | divmod
-              | enumerate | eval | exec | exit | filter | format | getattr
-              | globals | hasattr | hash | help | hex | id | input
-              | isinstance | issubclass | iter | len | license | locals | map
-              | max | memoryview | min | next | oct | open | ord | pow | print
-              | quit | range | reload | repr | reversed | round
-              | setattr | sorted | sum | vars | zip
+              __import__ | abs | aiter | all | any | anext | ascii | bin
+              | breakpoint | callable | chr | compile | copyright | credits
+              | delattr | dir | divmod | enumerate | eval | exec | exit
+              | filter | format | getattr | globals | hasattr | hash | help
+              | hex | id | input | isinstance | issubclass | iter | len
+              | license | locals | map | max | memoryview | min | next
+              | oct | open | ord | pow | print | quit | range | reload | repr
+              | reversed | round | setattr | sorted | sum | vars | zip
             )\b
 
       - name: variable.legacy.builtin.python
@@ -1325,24 +1332,29 @@ repository:
       (?x)
         \b(
           __(?:
-            abs | add | aenter | aexit | aiter | and | anext | await
-            | bool | call | ceil | cmp | coerce | complex | contains
-            | copy | deepcopy | del | delattr | delete | delitem
-            | delslice | dir | div | divmod | enter | eq | exit | float
-            | floor | floordiv | format | ge | get | getattr
-            | getattribute | getinitargs | getitem | getnewargs
-            | getslice | getstate | gt | hash | hex | iadd | iand | idiv
-            | ifloordiv | ilshift | imod | imul | index | init
-            | instancecheck | int | invert | ior | ipow | irshift | isub
-            | iter | itruediv | ixor | le | len | long | lshift | lt
-            | missing | mod | mul | ne | neg | new | next | nonzero | oct | or
-            | pos | pow | radd | rand | rdiv | rdivmod | reduce
-            | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod
-            | rmul | ror | round | rpow | rrshift | rshift | rsub
-            | rtruediv | rxor | set | setattr | setitem | setslice
-            | setstate | sizeof | str | sub | subclasscheck | truediv
-            | trunc | unicode | xor | matmul | rmatmul | imatmul
-            | init_subclass | set_name | fspath | bytes | prepare
+            abs | add | aenter | aexit | aiter | and | anext
+            | await | bool | call | ceil | class_getitem
+            | cmp | coerce | complex | contains | copy
+            | deepcopy | del | delattr | delete | delitem
+            | delslice | dir | div | divmod | enter | eq
+            | exit | float | floor | floordiv | format | ge
+            | get | getattr | getattribute | getinitargs
+            | getitem | getnewargs | getslice | getstate | gt
+            | hash | hex | iadd | iand | idiv | ifloordiv |
+            | ilshift | imod | imul | index | init
+            | instancecheck | int | invert | ior | ipow
+            | irshift | isub | iter | itruediv | ixor | le
+            | len | long | lshift | lt | missing | mod | mul
+            | ne | neg | new | next | nonzero | oct | or | pos
+            | pow | radd | rand | rdiv | rdivmod | reduce
+            | reduce_ex | repr | reversed | rfloordiv |
+            | rlshift | rmod | rmul | ror | round | rpow
+            | rrshift | rshift | rsub | rtruediv | rxor | set
+            | setattr | setitem | set_name | setslice
+            | setstate | sizeof | str | sub | subclasscheck
+            | truediv | trunc | unicode | xor | matmul
+            | rmatmul | imatmul | init_subclass | set_name
+            | fspath | bytes | prepare | length_hint
           )__
         )\b
     captures:
@@ -1354,12 +1366,12 @@ repository:
       (?x)
         \b(
           __(?:
-            all | bases | builtins | class | class_getitem | code | debug
-            | defaults | dict | doc | file | func | kwdefaults | members
-            | metaclass | methods | module | mro | mro_entries | name
-            | qualname | post_init | self | signature | slots | subclasses
-            | version | weakref | wrapped | annotations | classcell
-            | spec | path | package | future | traceback
+            all | annotations | bases | builtins | class
+            | closure | code | debug | defaults | dict | doc | file | func
+            | globals | kwdefaults | match_args | members | metaclass | methods
+            | module | mro | mro_entries | name | qualname | post_init | self
+            | signature | slots | subclasses | version | weakref | wrapped
+            | classcell | spec | path | package | future | traceback
           )__
         )\b
     captures:
diff --git a/test/atom-spec/python-spec.js b/test/atom-spec/python-spec.js
index cf00b257..79edf0a0 100644
--- a/test/atom-spec/python-spec.js
+++ b/test/atom-spec/python-spec.js
@@ -134,7 +134,7 @@ describe("Grammar Tests", function() {
 
   it("test/builtins/builtins3.py", 
     function() {
-      tokens = grammar.tokenizeLines("__all__ = ['bar', 'baz']\nsome.__bases__\nsome.__class__\nassert __debug__\n__builtins__\n__builtins__.len\nprint(__builtins__)\nsome.__dict__\nsome.__doc__\nsome.__file__\nsome.__members__\nsome.__metaclass__\nsome.__methods__\nsome.__module__\nsome.__mro__\nsome.__name__\nsome.__slots__\nsome.__subclasses__\nsome.__version__\nsome.__weakref__\nsome.__qualname__\nsome.__code__\nsome.__wrapped__\nsome.__signature__\nsome.__defaults__\nsome.__func__\nsome.__self__\nsome.__kwdefaults__\nsome.__matmul__\nsome.__imatmul__\nsome.__rmatmul__\nsome.__annotations__\nsome.__init_subclass__\nsome.__set_name__\nsome.__fspath__\nsome.__classcell__\nsome.__bytes__\nsome.__spec__\nsome.__path__\nsome.__prepare__\nsome.__package__\nsome.__traceback__\nsome.__notspecial__")
+      tokens = grammar.tokenizeLines("__all__ = ['bar', 'baz']\nsome.__bases__\nsome.__class__\nassert __debug__\n__builtins__\n__builtins__.len\nprint(__builtins__)\nsome.__dict__\nsome.__doc__\nsome.__file__\nsome.__members__\nsome.__metaclass__\nsome.__methods__\nsome.__module__\nsome.__mro__\nsome.__name__\nsome.__slots__\nsome.__subclasses__\nsome.__version__\nsome.__weakref__\nsome.__qualname__\nsome.__code__\nsome.__wrapped__\nsome.__signature__\nsome.__defaults__\nsome.__func__\nsome.__self__\nsome.__kwdefaults__\nsome.__matmul__\nsome.__imatmul__\nsome.__rmatmul__\nsome.__annotations__\nsome.__init_subclass__\nsome.__set_name__\nsome.__fspath__\nsome.__classcell__\nsome.__bytes__\nsome.__spec__\nsome.__path__\nsome.__prepare__\nsome.__package__\nsome.__traceback__\nsome.__closure__\nsome.__globals__\nsome.__match_args__\nsome.__notspecial__")
       expect(tokens[0][0].value).toBe("__all__");
       expect(tokens[0][0].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[0][1].value).toBe(" ");
@@ -411,8 +411,26 @@ describe("Grammar Tests", function() {
       expect(tokens[42][0].scopes).toEqual(["source.python"]);
       expect(tokens[42][1].value).toBe(".");
       expect(tokens[42][1].scopes).toEqual(["source.python","meta.member.access.python","punctuation.separator.period.python"]);
-      expect(tokens[42][2].value).toBe("__notspecial__");
-      expect(tokens[42][2].scopes).toEqual(["source.python","meta.member.access.python","meta.attribute.python"]);
+      expect(tokens[42][2].value).toBe("__closure__");
+      expect(tokens[42][2].scopes).toEqual(["source.python","meta.member.access.python","support.variable.magic.python"]);
+      expect(tokens[43][0].value).toBe("some");
+      expect(tokens[43][0].scopes).toEqual(["source.python"]);
+      expect(tokens[43][1].value).toBe(".");
+      expect(tokens[43][1].scopes).toEqual(["source.python","meta.member.access.python","punctuation.separator.period.python"]);
+      expect(tokens[43][2].value).toBe("__globals__");
+      expect(tokens[43][2].scopes).toEqual(["source.python","meta.member.access.python","support.variable.magic.python"]);
+      expect(tokens[44][0].value).toBe("some");
+      expect(tokens[44][0].scopes).toEqual(["source.python"]);
+      expect(tokens[44][1].value).toBe(".");
+      expect(tokens[44][1].scopes).toEqual(["source.python","meta.member.access.python","punctuation.separator.period.python"]);
+      expect(tokens[44][2].value).toBe("__match_args__");
+      expect(tokens[44][2].scopes).toEqual(["source.python","meta.member.access.python","support.variable.magic.python"]);
+      expect(tokens[45][0].value).toBe("some");
+      expect(tokens[45][0].scopes).toEqual(["source.python"]);
+      expect(tokens[45][1].value).toBe(".");
+      expect(tokens[45][1].scopes).toEqual(["source.python","meta.member.access.python","punctuation.separator.period.python"]);
+      expect(tokens[45][2].value).toBe("__notspecial__");
+      expect(tokens[45][2].scopes).toEqual(["source.python","meta.member.access.python","meta.attribute.python"]);
     });
 
   it("test/builtins/builtins4.py", 
@@ -516,13 +534,25 @@ describe("Grammar Tests", function() {
 
   it("test/builtins/builtins7.py", 
     function() {
-      tokens = grammar.tokenizeLines("breakpoint()")
+      tokens = grammar.tokenizeLines("breakpoint()\naiter()\nanext()")
       expect(tokens[0][0].value).toBe("breakpoint");
       expect(tokens[0][0].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
       expect(tokens[0][1].value).toBe("(");
       expect(tokens[0][1].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
       expect(tokens[0][2].value).toBe(")");
       expect(tokens[0][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[1][0].value).toBe("aiter");
+      expect(tokens[1][0].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[1][1].value).toBe("(");
+      expect(tokens[1][1].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[1][2].value).toBe(")");
+      expect(tokens[1][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[2][0].value).toBe("anext");
+      expect(tokens[2][0].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[2][1].value).toBe("(");
+      expect(tokens[2][1].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[2][2].value).toBe(")");
+      expect(tokens[2][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
     });
 
   it("test/calls/call1.py", 
@@ -2056,7 +2086,7 @@ describe("Grammar Tests", function() {
 
   it("test/classes/class9.py", 
     function() {
-      tokens = grammar.tokenizeLines("class Foo:\n    __slots__ = ()")
+      tokens = grammar.tokenizeLines("class Foo:\n    __slots__ = ()\n    __match_args__ = ('key', 'name')")
       expect(tokens[0][0].value).toBe("class");
       expect(tokens[0][0].scopes).toEqual(["source.python","meta.class.python","storage.type.class.python"]);
       expect(tokens[0][1].value).toBe(" ");
@@ -2079,6 +2109,36 @@ describe("Grammar Tests", function() {
       expect(tokens[1][5].scopes).toEqual(["source.python","punctuation.parenthesis.begin.python"]);
       expect(tokens[1][6].value).toBe(")");
       expect(tokens[1][6].scopes).toEqual(["source.python","punctuation.parenthesis.end.python"]);
+      expect(tokens[2][0].value).toBe("    ");
+      expect(tokens[2][0].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].value).toBe("__match_args__");
+      expect(tokens[2][1].scopes).toEqual(["source.python","support.variable.magic.python"]);
+      expect(tokens[2][2].value).toBe(" ");
+      expect(tokens[2][2].scopes).toEqual(["source.python"]);
+      expect(tokens[2][3].value).toBe("=");
+      expect(tokens[2][3].scopes).toEqual(["source.python","keyword.operator.assignment.python"]);
+      expect(tokens[2][4].value).toBe(" ");
+      expect(tokens[2][4].scopes).toEqual(["source.python"]);
+      expect(tokens[2][5].value).toBe("(");
+      expect(tokens[2][5].scopes).toEqual(["source.python","punctuation.parenthesis.begin.python"]);
+      expect(tokens[2][6].value).toBe("'");
+      expect(tokens[2][6].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][7].value).toBe("key");
+      expect(tokens[2][7].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[2][8].value).toBe("'");
+      expect(tokens[2][8].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][9].value).toBe(",");
+      expect(tokens[2][9].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[2][10].value).toBe(" ");
+      expect(tokens[2][10].scopes).toEqual(["source.python"]);
+      expect(tokens[2][11].value).toBe("'");
+      expect(tokens[2][11].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][12].value).toBe("name");
+      expect(tokens[2][12].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[2][13].value).toBe("'");
+      expect(tokens[2][13].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][14].value).toBe(")");
+      expect(tokens[2][14].scopes).toEqual(["source.python","punctuation.parenthesis.end.python"]);
     });
 
   it("test/classes/super1.py", 
@@ -5871,6 +5931,63 @@ describe("Grammar Tests", function() {
       expect(tokens[2][14].scopes).toEqual(["source.python","punctuation.parenthesis.end.python"]);
     });
 
+  it("test/expressions/expr22.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match = 13\ncase = 12\nif case == 4:\n  return match * 5")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("=");
+      expect(tokens[0][2].scopes).toEqual(["source.python","keyword.operator.assignment.python"]);
+      expect(tokens[0][3].value).toBe(" ");
+      expect(tokens[0][3].scopes).toEqual(["source.python"]);
+      expect(tokens[0][4].value).toBe("13");
+      expect(tokens[0][4].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+      expect(tokens[1][0].value).toBe("case");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe(" ");
+      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][2].value).toBe("=");
+      expect(tokens[1][2].scopes).toEqual(["source.python","keyword.operator.assignment.python"]);
+      expect(tokens[1][3].value).toBe(" ");
+      expect(tokens[1][3].scopes).toEqual(["source.python"]);
+      expect(tokens[1][4].value).toBe("12");
+      expect(tokens[1][4].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+      expect(tokens[2][0].value).toBe("if");
+      expect(tokens[2][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[2][1].value).toBe(" ");
+      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][2].value).toBe("case");
+      expect(tokens[2][2].scopes).toEqual(["source.python"]);
+      expect(tokens[2][3].value).toBe(" ");
+      expect(tokens[2][3].scopes).toEqual(["source.python"]);
+      expect(tokens[2][4].value).toBe("==");
+      expect(tokens[2][4].scopes).toEqual(["source.python","keyword.operator.comparison.python"]);
+      expect(tokens[2][5].value).toBe(" ");
+      expect(tokens[2][5].scopes).toEqual(["source.python"]);
+      expect(tokens[2][6].value).toBe("4");
+      expect(tokens[2][6].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+      expect(tokens[2][7].value).toBe(":");
+      expect(tokens[2][7].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[3][0].value).toBe("  ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("return");
+      expect(tokens[3][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("match");
+      expect(tokens[3][3].scopes).toEqual(["source.python"]);
+      expect(tokens[3][4].value).toBe(" ");
+      expect(tokens[3][4].scopes).toEqual(["source.python"]);
+      expect(tokens[3][5].value).toBe("*");
+      expect(tokens[3][5].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
+      expect(tokens[3][6].value).toBe(" ");
+      expect(tokens[3][6].scopes).toEqual(["source.python"]);
+      expect(tokens[3][7].value).toBe("5");
+      expect(tokens[3][7].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+    });
+
   it("test/expressions/expr3.py", 
     function() {
       tokens = grammar.tokenizeLines("(a, *rest, b) = range(5)")
@@ -6340,7 +6457,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][1].value).toBe(" ");
       expect(tokens[1][1].scopes).toEqual(["source.python","meta.function.python"]);
       expect(tokens[1][2].value).toBe("__class_getitem__");
-      expect(tokens[1][2].scopes).toEqual(["source.python","meta.function.python","support.variable.magic.python"]);
+      expect(tokens[1][2].scopes).toEqual(["source.python","meta.function.python","support.function.magic.python"]);
       expect(tokens[1][3].value).toBe("(");
       expect(tokens[1][3].scopes).toEqual(["source.python","meta.function.python","meta.function.parameters.python","punctuation.definition.parameters.begin.python"]);
       expect(tokens[1][4].value).toBe(")");
@@ -13174,6 +13291,1087 @@ describe("Grammar Tests", function() {
       expect(tokens[8][11].scopes).toEqual(["source.python","constant.language.python"]);
     });
 
+  it("test/statements/match1.py", 
+    function() {
+      tokens = grammar.tokenizeLines("def foo(status):\n    match status:\n        case 404:\n            return \"Not found\"\n        case 401 | 403:\n            return \"Not allowed\"\n        case _:\n            return \"Something's wrong with the internet\"")
+      expect(tokens[0][0].value).toBe("def");
+      expect(tokens[0][0].scopes).toEqual(["source.python","meta.function.python","storage.type.function.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python","meta.function.python"]);
+      expect(tokens[0][2].value).toBe("foo");
+      expect(tokens[0][2].scopes).toEqual(["source.python","meta.function.python","entity.name.function.python"]);
+      expect(tokens[0][3].value).toBe("(");
+      expect(tokens[0][3].scopes).toEqual(["source.python","meta.function.python","meta.function.parameters.python","punctuation.definition.parameters.begin.python"]);
+      expect(tokens[0][4].value).toBe("status");
+      expect(tokens[0][4].scopes).toEqual(["source.python","meta.function.python","meta.function.parameters.python","variable.parameter.function.language.python"]);
+      expect(tokens[0][5].value).toBe(")");
+      expect(tokens[0][5].scopes).toEqual(["source.python","meta.function.python","meta.function.parameters.python","punctuation.definition.parameters.end.python"]);
+      expect(tokens[0][6].value).toBe(":");
+      expect(tokens[0][6].scopes).toEqual(["source.python","meta.function.python","punctuation.section.function.begin.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("match");
+      expect(tokens[1][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("status");
+      expect(tokens[1][3].scopes).toEqual(["source.python"]);
+      expect(tokens[1][4].value).toBe(":");
+      expect(tokens[1][4].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[2][0].value).toBe("        ");
+      expect(tokens[2][0].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].value).toBe("case");
+      expect(tokens[2][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[2][2].value).toBe(" ");
+      expect(tokens[2][2].scopes).toEqual(["source.python"]);
+      expect(tokens[2][3].value).toBe("404");
+      expect(tokens[2][3].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+      expect(tokens[2][4].value).toBe(":");
+      expect(tokens[2][4].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[3][0].value).toBe("            ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("return");
+      expect(tokens[3][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("\"");
+      expect(tokens[3][3].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[3][4].value).toBe("Not found");
+      expect(tokens[3][4].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[3][5].value).toBe("\"");
+      expect(tokens[3][5].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][0].value).toBe("        ");
+      expect(tokens[4][0].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].value).toBe("case");
+      expect(tokens[4][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[4][2].value).toBe(" ");
+      expect(tokens[4][2].scopes).toEqual(["source.python"]);
+      expect(tokens[4][3].value).toBe("401");
+      expect(tokens[4][3].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+      expect(tokens[4][4].value).toBe(" ");
+      expect(tokens[4][4].scopes).toEqual(["source.python"]);
+      expect(tokens[4][5].value).toBe("|");
+      expect(tokens[4][5].scopes).toEqual(["source.python","keyword.operator.bitwise.python"]);
+      expect(tokens[4][6].value).toBe(" ");
+      expect(tokens[4][6].scopes).toEqual(["source.python"]);
+      expect(tokens[4][7].value).toBe("403");
+      expect(tokens[4][7].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
+      expect(tokens[4][8].value).toBe(":");
+      expect(tokens[4][8].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[5][0].value).toBe("            ");
+      expect(tokens[5][0].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].value).toBe("return");
+      expect(tokens[5][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("\"");
+      expect(tokens[5][3].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[5][4].value).toBe("Not allowed");
+      expect(tokens[5][4].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[5][5].value).toBe("\"");
+      expect(tokens[5][5].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[6][0].value).toBe("        ");
+      expect(tokens[6][0].scopes).toEqual(["source.python"]);
+      expect(tokens[6][1].value).toBe("case");
+      expect(tokens[6][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[6][2].value).toBe(" ");
+      expect(tokens[6][2].scopes).toEqual(["source.python"]);
+      expect(tokens[6][3].value).toBe("_");
+      expect(tokens[6][3].scopes).toEqual(["source.python"]);
+      expect(tokens[6][4].value).toBe(":");
+      expect(tokens[6][4].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[7][0].value).toBe("            ");
+      expect(tokens[7][0].scopes).toEqual(["source.python"]);
+      expect(tokens[7][1].value).toBe("return");
+      expect(tokens[7][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[7][2].value).toBe(" ");
+      expect(tokens[7][2].scopes).toEqual(["source.python"]);
+      expect(tokens[7][3].value).toBe("\"");
+      expect(tokens[7][3].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[7][4].value).toBe("Something's wrong with the internet");
+      expect(tokens[7][4].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[7][5].value).toBe("\"");
+      expect(tokens[7][5].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+    });
+
+  it("test/statements/match2.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match point:\n    case Point(x=0, y=0):\n        print(\"Origin is the point's location.\")\n    case Point(x=0, y=y):\n        print(f\"The point is on the y-axis.\")\n    case Point(x=x, y=0):\n        print(f\"The point is on the x-axis.\")\n    case Point():\n        print(\"The point is located somewhere else on the plane.\")\n    case _:\n        print(\"Not a point\")")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("point");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe(":");
+      expect(tokens[0][3].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("case");
+      expect(tokens[1][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("Point");
+      expect(tokens[1][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[1][4].value).toBe("(");
+      expect(tokens[1][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[1][5].value).toBe("x");
+      expect(tokens[1][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[1][6].value).toBe("=");
+      expect(tokens[1][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[1][7].value).toBe("0");
+      expect(tokens[1][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[1][8].value).toBe(",");
+      expect(tokens[1][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[1][9].value).toBe(" ");
+      expect(tokens[1][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[1][10].value).toBe("y");
+      expect(tokens[1][10].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[1][11].value).toBe("=");
+      expect(tokens[1][11].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[1][12].value).toBe("0");
+      expect(tokens[1][12].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[1][13].value).toBe(")");
+      expect(tokens[1][13].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[1][14].value).toBe(":");
+      expect(tokens[1][14].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[2][0].value).toBe("        ");
+      expect(tokens[2][0].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].value).toBe("print");
+      expect(tokens[2][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[2][2].value).toBe("(");
+      expect(tokens[2][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[2][3].value).toBe("\"");
+      expect(tokens[2][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][4].value).toBe("Origin is the point's location.");
+      expect(tokens[2][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python"]);
+      expect(tokens[2][5].value).toBe("\"");
+      expect(tokens[2][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][6].value).toBe(")");
+      expect(tokens[2][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][0].value).toBe("    ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("case");
+      expect(tokens[3][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("Point");
+      expect(tokens[3][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[3][4].value).toBe("(");
+      expect(tokens[3][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[3][5].value).toBe("x");
+      expect(tokens[3][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[3][6].value).toBe("=");
+      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[3][7].value).toBe("0");
+      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[3][8].value).toBe(",");
+      expect(tokens[3][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[3][9].value).toBe(" ");
+      expect(tokens[3][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][10].value).toBe("y");
+      expect(tokens[3][10].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[3][11].value).toBe("=");
+      expect(tokens[3][11].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[3][12].value).toBe("y");
+      expect(tokens[3][12].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][13].value).toBe(")");
+      expect(tokens[3][13].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][14].value).toBe(":");
+      expect(tokens[3][14].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[4][0].value).toBe("        ");
+      expect(tokens[4][0].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].value).toBe("print");
+      expect(tokens[4][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[4][2].value).toBe("(");
+      expect(tokens[4][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[4][3].value).toBe("f");
+      expect(tokens[4][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[4][4].value).toBe("\"");
+      expect(tokens[4][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[4][5].value).toBe("The point is on the y-axis.");
+      expect(tokens[4][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[4][6].value).toBe("\"");
+      expect(tokens[4][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[4][7].value).toBe(")");
+      expect(tokens[4][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[5][0].value).toBe("    ");
+      expect(tokens[5][0].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].value).toBe("case");
+      expect(tokens[5][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("Point");
+      expect(tokens[5][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[5][4].value).toBe("(");
+      expect(tokens[5][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[5][5].value).toBe("x");
+      expect(tokens[5][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[5][6].value).toBe("=");
+      expect(tokens[5][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[5][7].value).toBe("x");
+      expect(tokens[5][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[5][8].value).toBe(",");
+      expect(tokens[5][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[5][9].value).toBe(" ");
+      expect(tokens[5][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[5][10].value).toBe("y");
+      expect(tokens[5][10].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[5][11].value).toBe("=");
+      expect(tokens[5][11].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[5][12].value).toBe("0");
+      expect(tokens[5][12].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[5][13].value).toBe(")");
+      expect(tokens[5][13].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[5][14].value).toBe(":");
+      expect(tokens[5][14].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[6][0].value).toBe("        ");
+      expect(tokens[6][0].scopes).toEqual(["source.python"]);
+      expect(tokens[6][1].value).toBe("print");
+      expect(tokens[6][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[6][2].value).toBe("(");
+      expect(tokens[6][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[6][3].value).toBe("f");
+      expect(tokens[6][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[6][4].value).toBe("\"");
+      expect(tokens[6][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[6][5].value).toBe("The point is on the x-axis.");
+      expect(tokens[6][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[6][6].value).toBe("\"");
+      expect(tokens[6][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[6][7].value).toBe(")");
+      expect(tokens[6][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[7][0].value).toBe("    ");
+      expect(tokens[7][0].scopes).toEqual(["source.python"]);
+      expect(tokens[7][1].value).toBe("case");
+      expect(tokens[7][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[7][2].value).toBe(" ");
+      expect(tokens[7][2].scopes).toEqual(["source.python"]);
+      expect(tokens[7][3].value).toBe("Point");
+      expect(tokens[7][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[7][4].value).toBe("(");
+      expect(tokens[7][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[7][5].value).toBe(")");
+      expect(tokens[7][5].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[7][6].value).toBe(":");
+      expect(tokens[7][6].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[8][0].value).toBe("        ");
+      expect(tokens[8][0].scopes).toEqual(["source.python"]);
+      expect(tokens[8][1].value).toBe("print");
+      expect(tokens[8][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[8][2].value).toBe("(");
+      expect(tokens[8][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[8][3].value).toBe("\"");
+      expect(tokens[8][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[8][4].value).toBe("The point is located somewhere else on the plane.");
+      expect(tokens[8][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python"]);
+      expect(tokens[8][5].value).toBe("\"");
+      expect(tokens[8][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[8][6].value).toBe(")");
+      expect(tokens[8][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[9][0].value).toBe("    ");
+      expect(tokens[9][0].scopes).toEqual(["source.python"]);
+      expect(tokens[9][1].value).toBe("case");
+      expect(tokens[9][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[9][2].value).toBe(" ");
+      expect(tokens[9][2].scopes).toEqual(["source.python"]);
+      expect(tokens[9][3].value).toBe("_");
+      expect(tokens[9][3].scopes).toEqual(["source.python"]);
+      expect(tokens[9][4].value).toBe(":");
+      expect(tokens[9][4].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[10][0].value).toBe("        ");
+      expect(tokens[10][0].scopes).toEqual(["source.python"]);
+      expect(tokens[10][1].value).toBe("print");
+      expect(tokens[10][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[10][2].value).toBe("(");
+      expect(tokens[10][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[10][3].value).toBe("\"");
+      expect(tokens[10][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[10][4].value).toBe("Not a point");
+      expect(tokens[10][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python"]);
+      expect(tokens[10][5].value).toBe("\"");
+      expect(tokens[10][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[10][6].value).toBe(")");
+      expect(tokens[10][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+    });
+
+  it("test/statements/match3.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match points:\n    case []:\n        print(\"No points in the list.\")\n    case [Point(0, 0)]:\n        print(\"The origin is the only point in the list.\")\n    case [Point(x, y)]:\n        print(f\"A single point is in the list.\")\n    case [Point(0, y1), Point(0, y2)]:\n        print(f\"Two points on the Y axis are in the list.\")\n    case _:\n        print(\"Something else is found in the list.\")")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("points");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe(":");
+      expect(tokens[0][3].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("case");
+      expect(tokens[1][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("[");
+      expect(tokens[1][3].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[1][4].value).toBe("]");
+      expect(tokens[1][4].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[1][5].value).toBe(":");
+      expect(tokens[1][5].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[2][0].value).toBe("        ");
+      expect(tokens[2][0].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].value).toBe("print");
+      expect(tokens[2][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[2][2].value).toBe("(");
+      expect(tokens[2][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[2][3].value).toBe("\"");
+      expect(tokens[2][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][4].value).toBe("No points in the list.");
+      expect(tokens[2][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python"]);
+      expect(tokens[2][5].value).toBe("\"");
+      expect(tokens[2][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][6].value).toBe(")");
+      expect(tokens[2][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][0].value).toBe("    ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("case");
+      expect(tokens[3][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("[");
+      expect(tokens[3][3].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[3][4].value).toBe("Point");
+      expect(tokens[3][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[3][5].value).toBe("(");
+      expect(tokens[3][5].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[3][6].value).toBe("0");
+      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[3][7].value).toBe(",");
+      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[3][8].value).toBe(" ");
+      expect(tokens[3][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][9].value).toBe("0");
+      expect(tokens[3][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[3][10].value).toBe(")");
+      expect(tokens[3][10].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][11].value).toBe("]");
+      expect(tokens[3][11].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[3][12].value).toBe(":");
+      expect(tokens[3][12].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[4][0].value).toBe("        ");
+      expect(tokens[4][0].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].value).toBe("print");
+      expect(tokens[4][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[4][2].value).toBe("(");
+      expect(tokens[4][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[4][3].value).toBe("\"");
+      expect(tokens[4][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[4][4].value).toBe("The origin is the only point in the list.");
+      expect(tokens[4][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python"]);
+      expect(tokens[4][5].value).toBe("\"");
+      expect(tokens[4][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][6].value).toBe(")");
+      expect(tokens[4][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[5][0].value).toBe("    ");
+      expect(tokens[5][0].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].value).toBe("case");
+      expect(tokens[5][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("[");
+      expect(tokens[5][3].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[5][4].value).toBe("Point");
+      expect(tokens[5][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[5][5].value).toBe("(");
+      expect(tokens[5][5].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[5][6].value).toBe("x");
+      expect(tokens[5][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[5][7].value).toBe(",");
+      expect(tokens[5][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[5][8].value).toBe(" ");
+      expect(tokens[5][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[5][9].value).toBe("y");
+      expect(tokens[5][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[5][10].value).toBe(")");
+      expect(tokens[5][10].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[5][11].value).toBe("]");
+      expect(tokens[5][11].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[5][12].value).toBe(":");
+      expect(tokens[5][12].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[6][0].value).toBe("        ");
+      expect(tokens[6][0].scopes).toEqual(["source.python"]);
+      expect(tokens[6][1].value).toBe("print");
+      expect(tokens[6][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[6][2].value).toBe("(");
+      expect(tokens[6][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[6][3].value).toBe("f");
+      expect(tokens[6][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[6][4].value).toBe("\"");
+      expect(tokens[6][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[6][5].value).toBe("A single point is in the list.");
+      expect(tokens[6][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[6][6].value).toBe("\"");
+      expect(tokens[6][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[6][7].value).toBe(")");
+      expect(tokens[6][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[7][0].value).toBe("    ");
+      expect(tokens[7][0].scopes).toEqual(["source.python"]);
+      expect(tokens[7][1].value).toBe("case");
+      expect(tokens[7][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[7][2].value).toBe(" ");
+      expect(tokens[7][2].scopes).toEqual(["source.python"]);
+      expect(tokens[7][3].value).toBe("[");
+      expect(tokens[7][3].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[7][4].value).toBe("Point");
+      expect(tokens[7][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[7][5].value).toBe("(");
+      expect(tokens[7][5].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[7][6].value).toBe("0");
+      expect(tokens[7][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[7][7].value).toBe(",");
+      expect(tokens[7][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[7][8].value).toBe(" ");
+      expect(tokens[7][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[7][9].value).toBe("y1");
+      expect(tokens[7][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[7][10].value).toBe(")");
+      expect(tokens[7][10].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[7][11].value).toBe(",");
+      expect(tokens[7][11].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[7][12].value).toBe(" ");
+      expect(tokens[7][12].scopes).toEqual(["source.python"]);
+      expect(tokens[7][13].value).toBe("Point");
+      expect(tokens[7][13].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[7][14].value).toBe("(");
+      expect(tokens[7][14].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[7][15].value).toBe("0");
+      expect(tokens[7][15].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[7][16].value).toBe(",");
+      expect(tokens[7][16].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[7][17].value).toBe(" ");
+      expect(tokens[7][17].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[7][18].value).toBe("y2");
+      expect(tokens[7][18].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[7][19].value).toBe(")");
+      expect(tokens[7][19].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[7][20].value).toBe("]");
+      expect(tokens[7][20].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[7][21].value).toBe(":");
+      expect(tokens[7][21].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[8][0].value).toBe("        ");
+      expect(tokens[8][0].scopes).toEqual(["source.python"]);
+      expect(tokens[8][1].value).toBe("print");
+      expect(tokens[8][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[8][2].value).toBe("(");
+      expect(tokens[8][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[8][3].value).toBe("f");
+      expect(tokens[8][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[8][4].value).toBe("\"");
+      expect(tokens[8][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[8][5].value).toBe("Two points on the Y axis are in the list.");
+      expect(tokens[8][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[8][6].value).toBe("\"");
+      expect(tokens[8][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[8][7].value).toBe(")");
+      expect(tokens[8][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[9][0].value).toBe("    ");
+      expect(tokens[9][0].scopes).toEqual(["source.python"]);
+      expect(tokens[9][1].value).toBe("case");
+      expect(tokens[9][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[9][2].value).toBe(" ");
+      expect(tokens[9][2].scopes).toEqual(["source.python"]);
+      expect(tokens[9][3].value).toBe("_");
+      expect(tokens[9][3].scopes).toEqual(["source.python"]);
+      expect(tokens[9][4].value).toBe(":");
+      expect(tokens[9][4].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[10][0].value).toBe("        ");
+      expect(tokens[10][0].scopes).toEqual(["source.python"]);
+      expect(tokens[10][1].value).toBe("print");
+      expect(tokens[10][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[10][2].value).toBe("(");
+      expect(tokens[10][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[10][3].value).toBe("\"");
+      expect(tokens[10][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[10][4].value).toBe("Something else is found in the list.");
+      expect(tokens[10][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python"]);
+      expect(tokens[10][5].value).toBe("\"");
+      expect(tokens[10][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[10][6].value).toBe(")");
+      expect(tokens[10][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+    });
+
+  it("test/statements/match4.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match point:\n    case Point(x, y) if x == y:\n        print(f\"The point is located on the diagonal Y=X.\")\n    case Point(x, y):\n        print(f\"Point is not on the diagonal.\")")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("point");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe(":");
+      expect(tokens[0][3].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("case");
+      expect(tokens[1][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("Point");
+      expect(tokens[1][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[1][4].value).toBe("(");
+      expect(tokens[1][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[1][5].value).toBe("x");
+      expect(tokens[1][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[1][6].value).toBe(",");
+      expect(tokens[1][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[1][7].value).toBe(" ");
+      expect(tokens[1][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[1][8].value).toBe("y");
+      expect(tokens[1][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[1][9].value).toBe(")");
+      expect(tokens[1][9].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[1][10].value).toBe(" ");
+      expect(tokens[1][10].scopes).toEqual(["source.python"]);
+      expect(tokens[1][11].value).toBe("if");
+      expect(tokens[1][11].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[1][12].value).toBe(" ");
+      expect(tokens[1][12].scopes).toEqual(["source.python"]);
+      expect(tokens[1][13].value).toBe("x");
+      expect(tokens[1][13].scopes).toEqual(["source.python"]);
+      expect(tokens[1][14].value).toBe(" ");
+      expect(tokens[1][14].scopes).toEqual(["source.python"]);
+      expect(tokens[1][15].value).toBe("==");
+      expect(tokens[1][15].scopes).toEqual(["source.python","keyword.operator.comparison.python"]);
+      expect(tokens[1][16].value).toBe(" ");
+      expect(tokens[1][16].scopes).toEqual(["source.python"]);
+      expect(tokens[1][17].value).toBe("y");
+      expect(tokens[1][17].scopes).toEqual(["source.python"]);
+      expect(tokens[1][18].value).toBe(":");
+      expect(tokens[1][18].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[2][0].value).toBe("        ");
+      expect(tokens[2][0].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].value).toBe("print");
+      expect(tokens[2][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[2][2].value).toBe("(");
+      expect(tokens[2][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[2][3].value).toBe("f");
+      expect(tokens[2][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[2][4].value).toBe("\"");
+      expect(tokens[2][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[2][5].value).toBe("The point is located on the diagonal Y=X.");
+      expect(tokens[2][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[2][6].value).toBe("\"");
+      expect(tokens[2][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[2][7].value).toBe(")");
+      expect(tokens[2][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][0].value).toBe("    ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("case");
+      expect(tokens[3][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("Point");
+      expect(tokens[3][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[3][4].value).toBe("(");
+      expect(tokens[3][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[3][5].value).toBe("x");
+      expect(tokens[3][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][6].value).toBe(",");
+      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.arguments.python"]);
+      expect(tokens[3][7].value).toBe(" ");
+      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][8].value).toBe("y");
+      expect(tokens[3][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][9].value).toBe(")");
+      expect(tokens[3][9].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][10].value).toBe(":");
+      expect(tokens[3][10].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[4][0].value).toBe("        ");
+      expect(tokens[4][0].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].value).toBe("print");
+      expect(tokens[4][1].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[4][2].value).toBe("(");
+      expect(tokens[4][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[4][3].value).toBe("f");
+      expect(tokens[4][3].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[4][4].value).toBe("\"");
+      expect(tokens[4][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[4][5].value).toBe("Point is not on the diagonal.");
+      expect(tokens[4][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[4][6].value).toBe("\"");
+      expect(tokens[4][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[4][7].value).toBe(")");
+      expect(tokens[4][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+    });
+
+  it("test/statements/match5.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match command.split() if command else ['default']:\n    ... # Other cases\n    case [\"north\"] | [\"go\", \"north\"]:\n        ... # handle case\n    case [\"get\", obj] | [\"pick\", \"up\", *other] | [\"pick\", obj, \"up\"]:\n        ... # handle case")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("command");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe(".");
+      expect(tokens[0][3].scopes).toEqual(["source.python","meta.member.access.python","punctuation.separator.period.python"]);
+      expect(tokens[0][4].value).toBe("split");
+      expect(tokens[0][4].scopes).toEqual(["source.python","meta.member.access.python","meta.function-call.python","meta.function-call.generic.python"]);
+      expect(tokens[0][5].value).toBe("(");
+      expect(tokens[0][5].scopes).toEqual(["source.python","meta.member.access.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[0][6].value).toBe(")");
+      expect(tokens[0][6].scopes).toEqual(["source.python","meta.member.access.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[0][7].value).toBe(" ");
+      expect(tokens[0][7].scopes).toEqual(["source.python"]);
+      expect(tokens[0][8].value).toBe("if");
+      expect(tokens[0][8].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][9].value).toBe(" ");
+      expect(tokens[0][9].scopes).toEqual(["source.python"]);
+      expect(tokens[0][10].value).toBe("command");
+      expect(tokens[0][10].scopes).toEqual(["source.python"]);
+      expect(tokens[0][11].value).toBe(" ");
+      expect(tokens[0][11].scopes).toEqual(["source.python"]);
+      expect(tokens[0][12].value).toBe("else");
+      expect(tokens[0][12].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][13].value).toBe(" ");
+      expect(tokens[0][13].scopes).toEqual(["source.python"]);
+      expect(tokens[0][14].value).toBe("[");
+      expect(tokens[0][14].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[0][15].value).toBe("'");
+      expect(tokens[0][15].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[0][16].value).toBe("default");
+      expect(tokens[0][16].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[0][17].value).toBe("'");
+      expect(tokens[0][17].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[0][18].value).toBe("]");
+      expect(tokens[0][18].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[0][19].value).toBe(":");
+      expect(tokens[0][19].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("...");
+      expect(tokens[1][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("#");
+      expect(tokens[1][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[1][4].value).toBe(" Other cases");
+      expect(tokens[1][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[2][0].value).toBe("    ");
+      expect(tokens[2][0].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].value).toBe("case");
+      expect(tokens[2][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[2][2].value).toBe(" ");
+      expect(tokens[2][2].scopes).toEqual(["source.python"]);
+      expect(tokens[2][3].value).toBe("[");
+      expect(tokens[2][3].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[2][4].value).toBe("\"");
+      expect(tokens[2][4].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][5].value).toBe("north");
+      expect(tokens[2][5].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[2][6].value).toBe("\"");
+      expect(tokens[2][6].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][7].value).toBe("]");
+      expect(tokens[2][7].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[2][8].value).toBe(" ");
+      expect(tokens[2][8].scopes).toEqual(["source.python"]);
+      expect(tokens[2][9].value).toBe("|");
+      expect(tokens[2][9].scopes).toEqual(["source.python","keyword.operator.bitwise.python"]);
+      expect(tokens[2][10].value).toBe(" ");
+      expect(tokens[2][10].scopes).toEqual(["source.python"]);
+      expect(tokens[2][11].value).toBe("[");
+      expect(tokens[2][11].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[2][12].value).toBe("\"");
+      expect(tokens[2][12].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][13].value).toBe("go");
+      expect(tokens[2][13].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[2][14].value).toBe("\"");
+      expect(tokens[2][14].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][15].value).toBe(",");
+      expect(tokens[2][15].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[2][16].value).toBe(" ");
+      expect(tokens[2][16].scopes).toEqual(["source.python"]);
+      expect(tokens[2][17].value).toBe("\"");
+      expect(tokens[2][17].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][18].value).toBe("north");
+      expect(tokens[2][18].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[2][19].value).toBe("\"");
+      expect(tokens[2][19].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][20].value).toBe("]");
+      expect(tokens[2][20].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[2][21].value).toBe(":");
+      expect(tokens[2][21].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[3][0].value).toBe("        ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("...");
+      expect(tokens[3][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("#");
+      expect(tokens[3][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[3][4].value).toBe(" handle case");
+      expect(tokens[3][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[4][0].value).toBe("    ");
+      expect(tokens[4][0].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].value).toBe("case");
+      expect(tokens[4][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[4][2].value).toBe(" ");
+      expect(tokens[4][2].scopes).toEqual(["source.python"]);
+      expect(tokens[4][3].value).toBe("[");
+      expect(tokens[4][3].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[4][4].value).toBe("\"");
+      expect(tokens[4][4].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[4][5].value).toBe("get");
+      expect(tokens[4][5].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[4][6].value).toBe("\"");
+      expect(tokens[4][6].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][7].value).toBe(",");
+      expect(tokens[4][7].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[4][8].value).toBe(" ");
+      expect(tokens[4][8].scopes).toEqual(["source.python"]);
+      expect(tokens[4][9].value).toBe("obj");
+      expect(tokens[4][9].scopes).toEqual(["source.python"]);
+      expect(tokens[4][10].value).toBe("]");
+      expect(tokens[4][10].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[4][11].value).toBe(" ");
+      expect(tokens[4][11].scopes).toEqual(["source.python"]);
+      expect(tokens[4][12].value).toBe("|");
+      expect(tokens[4][12].scopes).toEqual(["source.python","keyword.operator.bitwise.python"]);
+      expect(tokens[4][13].value).toBe(" ");
+      expect(tokens[4][13].scopes).toEqual(["source.python"]);
+      expect(tokens[4][14].value).toBe("[");
+      expect(tokens[4][14].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[4][15].value).toBe("\"");
+      expect(tokens[4][15].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[4][16].value).toBe("pick");
+      expect(tokens[4][16].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[4][17].value).toBe("\"");
+      expect(tokens[4][17].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][18].value).toBe(",");
+      expect(tokens[4][18].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[4][19].value).toBe(" ");
+      expect(tokens[4][19].scopes).toEqual(["source.python"]);
+      expect(tokens[4][20].value).toBe("\"");
+      expect(tokens[4][20].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[4][21].value).toBe("up");
+      expect(tokens[4][21].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[4][22].value).toBe("\"");
+      expect(tokens[4][22].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][23].value).toBe(",");
+      expect(tokens[4][23].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[4][24].value).toBe(" ");
+      expect(tokens[4][24].scopes).toEqual(["source.python"]);
+      expect(tokens[4][25].value).toBe("*");
+      expect(tokens[4][25].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
+      expect(tokens[4][26].value).toBe("other");
+      expect(tokens[4][26].scopes).toEqual(["source.python"]);
+      expect(tokens[4][27].value).toBe("]");
+      expect(tokens[4][27].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[4][28].value).toBe(" ");
+      expect(tokens[4][28].scopes).toEqual(["source.python"]);
+      expect(tokens[4][29].value).toBe("|");
+      expect(tokens[4][29].scopes).toEqual(["source.python","keyword.operator.bitwise.python"]);
+      expect(tokens[4][30].value).toBe(" ");
+      expect(tokens[4][30].scopes).toEqual(["source.python"]);
+      expect(tokens[4][31].value).toBe("[");
+      expect(tokens[4][31].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[4][32].value).toBe("\"");
+      expect(tokens[4][32].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[4][33].value).toBe("pick");
+      expect(tokens[4][33].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[4][34].value).toBe("\"");
+      expect(tokens[4][34].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][35].value).toBe(",");
+      expect(tokens[4][35].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[4][36].value).toBe(" ");
+      expect(tokens[4][36].scopes).toEqual(["source.python"]);
+      expect(tokens[4][37].value).toBe("obj");
+      expect(tokens[4][37].scopes).toEqual(["source.python"]);
+      expect(tokens[4][38].value).toBe(",");
+      expect(tokens[4][38].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[4][39].value).toBe(" ");
+      expect(tokens[4][39].scopes).toEqual(["source.python"]);
+      expect(tokens[4][40].value).toBe("\"");
+      expect(tokens[4][40].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[4][41].value).toBe("up");
+      expect(tokens[4][41].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[4][42].value).toBe("\"");
+      expect(tokens[4][42].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[4][43].value).toBe("]");
+      expect(tokens[4][43].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[4][44].value).toBe(":");
+      expect(tokens[4][44].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[5][0].value).toBe("        ");
+      expect(tokens[5][0].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].value).toBe("...");
+      expect(tokens[5][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("#");
+      expect(tokens[5][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[5][4].value).toBe(" handle case");
+      expect(tokens[5][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+    });
+
+  it("test/statements/match6.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match (foo + bar):\n    ... # cases\nmatch [foo, bar]:\n    ... # cases\nmatch {foo, bar}:\n    ... # cases")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("(");
+      expect(tokens[0][2].scopes).toEqual(["source.python","punctuation.parenthesis.begin.python"]);
+      expect(tokens[0][3].value).toBe("foo");
+      expect(tokens[0][3].scopes).toEqual(["source.python"]);
+      expect(tokens[0][4].value).toBe(" ");
+      expect(tokens[0][4].scopes).toEqual(["source.python"]);
+      expect(tokens[0][5].value).toBe("+");
+      expect(tokens[0][5].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
+      expect(tokens[0][6].value).toBe(" ");
+      expect(tokens[0][6].scopes).toEqual(["source.python"]);
+      expect(tokens[0][7].value).toBe("bar");
+      expect(tokens[0][7].scopes).toEqual(["source.python"]);
+      expect(tokens[0][8].value).toBe(")");
+      expect(tokens[0][8].scopes).toEqual(["source.python","punctuation.parenthesis.end.python"]);
+      expect(tokens[0][9].value).toBe(":");
+      expect(tokens[0][9].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("...");
+      expect(tokens[1][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("#");
+      expect(tokens[1][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[1][4].value).toBe(" cases");
+      expect(tokens[1][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[2][0].value).toBe("match");
+      expect(tokens[2][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[2][1].value).toBe(" ");
+      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][2].value).toBe("[");
+      expect(tokens[2][2].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
+      expect(tokens[2][3].value).toBe("foo");
+      expect(tokens[2][3].scopes).toEqual(["source.python"]);
+      expect(tokens[2][4].value).toBe(",");
+      expect(tokens[2][4].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[2][5].value).toBe(" ");
+      expect(tokens[2][5].scopes).toEqual(["source.python"]);
+      expect(tokens[2][6].value).toBe("bar");
+      expect(tokens[2][6].scopes).toEqual(["source.python"]);
+      expect(tokens[2][7].value).toBe("]");
+      expect(tokens[2][7].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
+      expect(tokens[2][8].value).toBe(":");
+      expect(tokens[2][8].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[3][0].value).toBe("    ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("...");
+      expect(tokens[3][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("#");
+      expect(tokens[3][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[3][4].value).toBe(" cases");
+      expect(tokens[3][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[4][0].value).toBe("match");
+      expect(tokens[4][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[4][1].value).toBe(" ");
+      expect(tokens[4][1].scopes).toEqual(["source.python"]);
+      expect(tokens[4][2].value).toBe("{");
+      expect(tokens[4][2].scopes).toEqual(["source.python","punctuation.definition.dict.begin.python"]);
+      expect(tokens[4][3].value).toBe("foo");
+      expect(tokens[4][3].scopes).toEqual(["source.python"]);
+      expect(tokens[4][4].value).toBe(",");
+      expect(tokens[4][4].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[4][5].value).toBe(" ");
+      expect(tokens[4][5].scopes).toEqual(["source.python"]);
+      expect(tokens[4][6].value).toBe("bar");
+      expect(tokens[4][6].scopes).toEqual(["source.python"]);
+      expect(tokens[4][7].value).toBe("}");
+      expect(tokens[4][7].scopes).toEqual(["source.python","punctuation.definition.dict.end.python"]);
+      expect(tokens[4][8].value).toBe(":");
+      expect(tokens[4][8].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[5][0].value).toBe("    ");
+      expect(tokens[5][0].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].value).toBe("...");
+      expect(tokens[5][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("#");
+      expect(tokens[5][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[5][4].value).toBe(" cases");
+      expect(tokens[5][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+    });
+
+  it("test/statements/match7.py", 
+    function() {
+      tokens = grammar.tokenizeLines("match 'prefix' + foo:\n    ... # cases\nmatch \"prefix\" + foo:\n    ... # cases\nmatch f'prefix{foo}':\n    ... # cases\nmatch f\"prefix{foo}\":\n    ... # cases\nmatch -foo:\n    ... # cases\nmatch not foo:\n    ... # cases")
+      expect(tokens[0][0].value).toBe("match");
+      expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][1].value).toBe(" ");
+      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][2].value).toBe("'");
+      expect(tokens[0][2].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[0][3].value).toBe("prefix");
+      expect(tokens[0][3].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[0][4].value).toBe("'");
+      expect(tokens[0][4].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[0][5].value).toBe(" ");
+      expect(tokens[0][5].scopes).toEqual(["source.python"]);
+      expect(tokens[0][6].value).toBe("+");
+      expect(tokens[0][6].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
+      expect(tokens[0][7].value).toBe(" ");
+      expect(tokens[0][7].scopes).toEqual(["source.python"]);
+      expect(tokens[0][8].value).toBe("foo");
+      expect(tokens[0][8].scopes).toEqual(["source.python"]);
+      expect(tokens[0][9].value).toBe(":");
+      expect(tokens[0][9].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[1][0].value).toBe("    ");
+      expect(tokens[1][0].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe("...");
+      expect(tokens[1][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("#");
+      expect(tokens[1][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[1][4].value).toBe(" cases");
+      expect(tokens[1][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[2][0].value).toBe("match");
+      expect(tokens[2][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[2][1].value).toBe(" ");
+      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][2].value).toBe("\"");
+      expect(tokens[2][2].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[2][3].value).toBe("prefix");
+      expect(tokens[2][3].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[2][4].value).toBe("\"");
+      expect(tokens[2][4].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[2][5].value).toBe(" ");
+      expect(tokens[2][5].scopes).toEqual(["source.python"]);
+      expect(tokens[2][6].value).toBe("+");
+      expect(tokens[2][6].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
+      expect(tokens[2][7].value).toBe(" ");
+      expect(tokens[2][7].scopes).toEqual(["source.python"]);
+      expect(tokens[2][8].value).toBe("foo");
+      expect(tokens[2][8].scopes).toEqual(["source.python"]);
+      expect(tokens[2][9].value).toBe(":");
+      expect(tokens[2][9].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[3][0].value).toBe("    ");
+      expect(tokens[3][0].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe("...");
+      expect(tokens[3][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("#");
+      expect(tokens[3][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[3][4].value).toBe(" cases");
+      expect(tokens[3][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[4][0].value).toBe("match");
+      expect(tokens[4][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[4][1].value).toBe(" ");
+      expect(tokens[4][1].scopes).toEqual(["source.python"]);
+      expect(tokens[4][2].value).toBe("f");
+      expect(tokens[4][2].scopes).toEqual(["source.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[4][3].value).toBe("'");
+      expect(tokens[4][3].scopes).toEqual(["source.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[4][4].value).toBe("prefix");
+      expect(tokens[4][4].scopes).toEqual(["source.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[4][5].value).toBe("{");
+      expect(tokens[4][5].scopes).toEqual(["source.python","meta.fstring.python","constant.character.format.placeholder.other.python"]);
+      expect(tokens[4][6].value).toBe("foo");
+      expect(tokens[4][6].scopes).toEqual(["source.python","meta.fstring.python"]);
+      expect(tokens[4][7].value).toBe("}");
+      expect(tokens[4][7].scopes).toEqual(["source.python","meta.fstring.python","constant.character.format.placeholder.other.python"]);
+      expect(tokens[4][8].value).toBe("'");
+      expect(tokens[4][8].scopes).toEqual(["source.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[4][9].value).toBe(":");
+      expect(tokens[4][9].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[5][0].value).toBe("    ");
+      expect(tokens[5][0].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].value).toBe("...");
+      expect(tokens[5][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("#");
+      expect(tokens[5][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[5][4].value).toBe(" cases");
+      expect(tokens[5][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[6][0].value).toBe("match");
+      expect(tokens[6][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[6][1].value).toBe(" ");
+      expect(tokens[6][1].scopes).toEqual(["source.python"]);
+      expect(tokens[6][2].value).toBe("f");
+      expect(tokens[6][2].scopes).toEqual(["source.python","meta.fstring.python","storage.type.string.python string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[6][3].value).toBe("\"");
+      expect(tokens[6][3].scopes).toEqual(["source.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"]);
+      expect(tokens[6][4].value).toBe("prefix");
+      expect(tokens[6][4].scopes).toEqual(["source.python","meta.fstring.python","string.quoted.single.python string.interpolated.python"]);
+      expect(tokens[6][5].value).toBe("{");
+      expect(tokens[6][5].scopes).toEqual(["source.python","meta.fstring.python","constant.character.format.placeholder.other.python"]);
+      expect(tokens[6][6].value).toBe("foo");
+      expect(tokens[6][6].scopes).toEqual(["source.python","meta.fstring.python"]);
+      expect(tokens[6][7].value).toBe("}");
+      expect(tokens[6][7].scopes).toEqual(["source.python","meta.fstring.python","constant.character.format.placeholder.other.python"]);
+      expect(tokens[6][8].value).toBe("\"");
+      expect(tokens[6][8].scopes).toEqual(["source.python","meta.fstring.python","string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"]);
+      expect(tokens[6][9].value).toBe(":");
+      expect(tokens[6][9].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[7][0].value).toBe("    ");
+      expect(tokens[7][0].scopes).toEqual(["source.python"]);
+      expect(tokens[7][1].value).toBe("...");
+      expect(tokens[7][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[7][2].value).toBe(" ");
+      expect(tokens[7][2].scopes).toEqual(["source.python"]);
+      expect(tokens[7][3].value).toBe("#");
+      expect(tokens[7][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[7][4].value).toBe(" cases");
+      expect(tokens[7][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[8][0].value).toBe("match");
+      expect(tokens[8][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[8][1].value).toBe(" ");
+      expect(tokens[8][1].scopes).toEqual(["source.python"]);
+      expect(tokens[8][2].value).toBe("-");
+      expect(tokens[8][2].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
+      expect(tokens[8][3].value).toBe("foo");
+      expect(tokens[8][3].scopes).toEqual(["source.python"]);
+      expect(tokens[8][4].value).toBe(":");
+      expect(tokens[8][4].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[9][0].value).toBe("    ");
+      expect(tokens[9][0].scopes).toEqual(["source.python"]);
+      expect(tokens[9][1].value).toBe("...");
+      expect(tokens[9][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[9][2].value).toBe(" ");
+      expect(tokens[9][2].scopes).toEqual(["source.python"]);
+      expect(tokens[9][3].value).toBe("#");
+      expect(tokens[9][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[9][4].value).toBe(" cases");
+      expect(tokens[9][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[10][0].value).toBe("match");
+      expect(tokens[10][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[10][1].value).toBe(" ");
+      expect(tokens[10][1].scopes).toEqual(["source.python"]);
+      expect(tokens[10][2].value).toBe("not");
+      expect(tokens[10][2].scopes).toEqual(["source.python","keyword.operator.logical.python"]);
+      expect(tokens[10][3].value).toBe(" ");
+      expect(tokens[10][3].scopes).toEqual(["source.python"]);
+      expect(tokens[10][4].value).toBe("foo");
+      expect(tokens[10][4].scopes).toEqual(["source.python"]);
+      expect(tokens[10][5].value).toBe(":");
+      expect(tokens[10][5].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
+      expect(tokens[11][0].value).toBe("    ");
+      expect(tokens[11][0].scopes).toEqual(["source.python"]);
+      expect(tokens[11][1].value).toBe("...");
+      expect(tokens[11][1].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
+      expect(tokens[11][2].value).toBe(" ");
+      expect(tokens[11][2].scopes).toEqual(["source.python"]);
+      expect(tokens[11][3].value).toBe("#");
+      expect(tokens[11][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[11][4].value).toBe(" cases");
+      expect(tokens[11][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+    });
+
   it("test/statements/nonlocal1.py", 
     function() {
       tokens = grammar.tokenizeLines("nonlocal a, b, c")
diff --git a/test/builtins/builtins3.py b/test/builtins/builtins3.py
index 181eacd1..f1f90d9c 100644
--- a/test/builtins/builtins3.py
+++ b/test/builtins/builtins3.py
@@ -40,6 +40,9 @@
 some.__prepare__
 some.__package__
 some.__traceback__
+some.__closure__
+some.__globals__
+some.__match_args__
 some.__notspecial__
 
 
@@ -183,4 +186,13 @@
 __traceback__ : meta.member.access.python, source.python, support.variable.magic.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
+__closure__   : meta.member.access.python, source.python, support.variable.magic.python
+some          : source.python
+.             : meta.member.access.python, punctuation.separator.period.python, source.python
+__globals__   : meta.member.access.python, source.python, support.variable.magic.python
+some          : source.python
+.             : meta.member.access.python, punctuation.separator.period.python, source.python
+__match_args__ : meta.member.access.python, source.python, support.variable.magic.python
+some          : source.python
+.             : meta.member.access.python, punctuation.separator.period.python, source.python
 __notspecial__ : meta.attribute.python, meta.member.access.python, source.python
diff --git a/test/builtins/builtins7.py b/test/builtins/builtins7.py
index eb02d7fb..6d23b2b7 100644
--- a/test/builtins/builtins7.py
+++ b/test/builtins/builtins7.py
@@ -1,4 +1,6 @@
 breakpoint()
+aiter()
+anext()
 
 
 
@@ -6,3 +8,9 @@
 breakpoint    : meta.function-call.python, source.python, support.function.builtin.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+aiter         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+anext         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
diff --git a/test/classes/class9.py b/test/classes/class9.py
index bbf24feb..a4ea943f 100644
--- a/test/classes/class9.py
+++ b/test/classes/class9.py
@@ -1,5 +1,6 @@
 class Foo:
     __slots__ = ()
+    __match_args__ = ('key', 'name')
 
 
 
@@ -13,4 +14,19 @@ class         : meta.class.python, source.python, storage.type.class.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 (             : punctuation.parenthesis.begin.python, source.python
+)             : punctuation.parenthesis.end.python, source.python
+              : source.python
+__match_args__ : source.python, support.variable.magic.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+(             : punctuation.parenthesis.begin.python, source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+key           : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+name          : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
 )             : punctuation.parenthesis.end.python, source.python
diff --git a/test/expressions/expr22.py b/test/expressions/expr22.py
new file mode 100644
index 00000000..7c03f542
--- /dev/null
+++ b/test/expressions/expr22.py
@@ -0,0 +1,33 @@
+match = 13
+case = 12
+if case == 4:
+  return match * 5
+
+
+
+match         : source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+13            : constant.numeric.dec.python, source.python
+case          : source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+12            : constant.numeric.dec.python, source.python
+if            : keyword.control.flow.python, source.python
+              : source.python
+case          : source.python
+              : source.python
+==            : keyword.operator.comparison.python, source.python
+              : source.python
+4             : constant.numeric.dec.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+return        : keyword.control.flow.python, source.python
+              : source.python
+match         : source.python
+              : source.python
+*             : keyword.operator.arithmetic.python, source.python
+              : source.python
+5             : constant.numeric.dec.python, source.python
diff --git a/test/expressions/special2.py b/test/expressions/special2.py
index 2f360985..727d664f 100644
--- a/test/expressions/special2.py
+++ b/test/expressions/special2.py
@@ -7,7 +7,7 @@ def __class_getitem__(): pass
 __post_init__ : source.python, support.variable.magic.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
-__class_getitem__ : meta.function.python, source.python, support.variable.magic.python
+__class_getitem__ : meta.function.python, source.python, support.function.magic.python
 (             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.begin.python, source.python
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
diff --git a/test/statements/match1.py b/test/statements/match1.py
new file mode 100644
index 00000000..f393066a
--- /dev/null
+++ b/test/statements/match1.py
@@ -0,0 +1,61 @@
+def foo(status):
+    match status:
+        case 404:
+            return "Not found"
+        case 401 | 403:
+            return "Not allowed"
+        case _:
+            return "Something's wrong with the internet"
+
+
+
+
+def           : meta.function.python, source.python, storage.type.function.python
+              : meta.function.python, source.python
+foo           : entity.name.function.python, meta.function.python, source.python
+(             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.begin.python, source.python
+status        : meta.function.parameters.python, meta.function.python, source.python, variable.parameter.function.language.python
+)             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
+:             : meta.function.python, punctuation.section.function.begin.python, source.python
+              : source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+status        : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+404           : constant.numeric.dec.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+return        : keyword.control.flow.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+Not found     : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+401           : constant.numeric.dec.python, source.python
+              : source.python
+|             : keyword.operator.bitwise.python, source.python
+              : source.python
+403           : constant.numeric.dec.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+return        : keyword.control.flow.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+Not allowed   : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+_             : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+return        : keyword.control.flow.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+Something's wrong with the internet : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
diff --git a/test/statements/match2.py b/test/statements/match2.py
new file mode 100644
index 00000000..a88ba055
--- /dev/null
+++ b/test/statements/match2.py
@@ -0,0 +1,112 @@
+match point:
+    case Point(x=0, y=0):
+        print("Origin is the point's location.")
+    case Point(x=0, y=y):
+        print(f"The point is on the y-axis.")
+    case Point(x=x, y=0):
+        print(f"The point is on the x-axis.")
+    case Point():
+        print("The point is located somewhere else on the plane.")
+    case _:
+        print("Not a point")
+
+
+
+match         : keyword.control.flow.python, source.python
+              : source.python
+point         : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
+=             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
+=             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+Origin is the point's location. : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
+=             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
+=             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+The point is on the y-axis. : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
+=             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
+=             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+The point is on the x-axis. : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+The point is located somewhere else on the plane. : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+_             : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+Not a point   : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
diff --git a/test/statements/match3.py b/test/statements/match3.py
new file mode 100644
index 00000000..ac8e176c
--- /dev/null
+++ b/test/statements/match3.py
@@ -0,0 +1,114 @@
+match points:
+    case []:
+        print("No points in the list.")
+    case [Point(0, 0)]:
+        print("The origin is the only point in the list.")
+    case [Point(x, y)]:
+        print(f"A single point is in the list.")
+    case [Point(0, y1), Point(0, y2)]:
+        print(f"Two points on the Y axis are in the list.")
+    case _:
+        print("Something else is found in the list.")
+
+
+
+match         : keyword.control.flow.python, source.python
+              : source.python
+points        : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+No points in the list. : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+The origin is the only point in the list. : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+A single point is in the list. : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y1            : meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+0             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y2            : meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+Two points on the Y axis are in the list. : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+_             : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+Something else is found in the list. : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
+"             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
diff --git a/test/statements/match4.py b/test/statements/match4.py
new file mode 100644
index 00000000..fc4857f5
--- /dev/null
+++ b/test/statements/match4.py
@@ -0,0 +1,59 @@
+match point:
+    case Point(x, y) if x == y:
+        print(f"The point is located on the diagonal Y=X.")
+    case Point(x, y):
+        print(f"Point is not on the diagonal.")
+
+
+
+
+match         : keyword.control.flow.python, source.python
+              : source.python
+point         : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+if            : keyword.control.flow.python, source.python
+              : source.python
+x             : source.python
+              : source.python
+==            : keyword.operator.comparison.python, source.python
+              : source.python
+y             : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+The point is located on the diagonal Y=X. : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+Point         : meta.function-call.generic.python, meta.function-call.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+x             : meta.function-call.arguments.python, meta.function-call.python, source.python
+,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
+              : meta.function-call.arguments.python, meta.function-call.python, source.python
+y             : meta.function-call.arguments.python, meta.function-call.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+print         : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+Point is not on the diagonal. : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
diff --git a/test/statements/match5.py b/test/statements/match5.py
new file mode 100644
index 00000000..905ef8ba
--- /dev/null
+++ b/test/statements/match5.py
@@ -0,0 +1,112 @@
+match command.split() if command else ['default']:
+    ... # Other cases
+    case ["north"] | ["go", "north"]:
+        ... # handle case
+    case ["get", obj] | ["pick", "up", *other] | ["pick", obj, "up"]:
+        ... # handle case
+
+
+
+
+match         : keyword.control.flow.python, source.python
+              : source.python
+command       : source.python
+.             : meta.member.access.python, punctuation.separator.period.python, source.python
+split         : meta.function-call.generic.python, meta.function-call.python, meta.member.access.python, source.python
+(             : meta.function-call.python, meta.member.access.python, punctuation.definition.arguments.begin.python, source.python
+)             : meta.function-call.python, meta.member.access.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+if            : keyword.control.flow.python, source.python
+              : source.python
+command       : source.python
+              : source.python
+else          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+default       : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ Other cases  : comment.line.number-sign.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+north         : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+]             : punctuation.definition.list.end.python, source.python
+              : source.python
+|             : keyword.operator.bitwise.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+go            : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+north         : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ handle case  : comment.line.number-sign.python, source.python
+              : source.python
+case          : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+get           : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+obj           : source.python
+]             : punctuation.definition.list.end.python, source.python
+              : source.python
+|             : keyword.operator.bitwise.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+pick          : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+up            : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+*             : keyword.operator.arithmetic.python, source.python
+other         : source.python
+]             : punctuation.definition.list.end.python, source.python
+              : source.python
+|             : keyword.operator.bitwise.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+pick          : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+obj           : source.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+up            : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ handle case  : comment.line.number-sign.python, source.python
diff --git a/test/statements/match6.py b/test/statements/match6.py
new file mode 100644
index 00000000..b74491f7
--- /dev/null
+++ b/test/statements/match6.py
@@ -0,0 +1,53 @@
+match (foo + bar):
+    ... # cases
+match [foo, bar]:
+    ... # cases
+match {foo, bar}:
+    ... # cases
+
+
+
+
+match         : keyword.control.flow.python, source.python
+              : source.python
+(             : punctuation.parenthesis.begin.python, source.python
+foo           : source.python
+              : source.python
++             : keyword.operator.arithmetic.python, source.python
+              : source.python
+bar           : source.python
+)             : punctuation.parenthesis.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+foo           : source.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+bar           : source.python
+]             : punctuation.definition.list.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+{             : punctuation.definition.dict.begin.python, source.python
+foo           : source.python
+,             : punctuation.separator.element.python, source.python
+              : source.python
+bar           : source.python
+}             : punctuation.definition.dict.end.python, source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
\ No newline at end of file
diff --git a/test/statements/match7.py b/test/statements/match7.py
new file mode 100644
index 00000000..878fa813
--- /dev/null
+++ b/test/statements/match7.py
@@ -0,0 +1,97 @@
+match 'prefix' + foo:
+    ... # cases
+match "prefix" + foo:
+    ... # cases
+match f'prefix{foo}':
+    ... # cases
+match f"prefix{foo}":
+    ... # cases
+match -foo:
+    ... # cases
+match not foo:
+    ... # cases
+
+
+
+
+match         : keyword.control.flow.python, source.python
+              : source.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+prefix        : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+              : source.python
++             : keyword.operator.arithmetic.python, source.python
+              : source.python
+foo           : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+prefix        : source.python, string.quoted.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
+              : source.python
++             : keyword.operator.arithmetic.python, source.python
+              : source.python
+foo           : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+f             : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+prefix        : meta.fstring.python, source.python, string.interpolated.python, string.quoted.single.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+foo           : meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+f             : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
+"             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.quoted.single.python
+prefix        : meta.fstring.python, source.python, string.interpolated.python, string.quoted.single.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+foo           : meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+"             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.single.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+-             : keyword.operator.arithmetic.python, source.python
+foo           : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
+match         : keyword.control.flow.python, source.python
+              : source.python
+not           : keyword.operator.logical.python, source.python
+              : source.python
+foo           : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+...           : constant.other.ellipsis.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ cases        : comment.line.number-sign.python, source.python
\ No newline at end of file