@willbooster/tree-sitter-python 2.0.2 → 2.1.1

package/README.md

@@ -5,14 +5,15 @@
 [![Test](https://github.com/WillBooster/tree-sitter-python/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-python/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-python/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-python/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.36.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.41.8-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-python.svg)](https://crates.io/crates/willbooster-tree-sitter-python)
 
 Python grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
 [tree-sitter/tree-sitter-python](https://github.com/tree-sitter/tree-sitter-python). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork ships the unmodified grammar of upstream v0.25.0 as a compact parser, generated by the parser generator of
+This fork builds on upstream v0.25.0 with grammar, scanner, and highlighting fixes, including Python 3.15
+unpacking comprehensions. It ships a compact parser generated by the parser generator of
 [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter). The parser carries that fork's own ABI number, so
 it loads only with the WillBooster runtime (`willbooster-tree-sitter` or `@willbooster/web-tree-sitter`) 2.0.0 or later,
 not with upstream's tree-sitter.

package/grammar.js

@@ -6,9 +6,11 @@
  * @see {@link https://docs.python.org/3/reference/grammar.html|Python 3 grammar}
  */
 
-/// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
+const { grammar, seq, choice, repeat, repeat1, optional, token, prec, alias, field, sym } =
+  /** @type {typeof globalThis & import('@willbooster/web-tree-sitter/dsl').DSL} */ (globalThis);
+
 const PREC = {
   // this resolves a conflict between the usage of ':' in a lambda vs in a
   // typed parameter. In the case of a lambda, we don't allow typed parameters.
@@ -17,7 +19,6 @@ const PREC = {
   conditional: -1,
 
   parenthesized_expression: 1,
-  parenthesized_list_splat: 1,
   or: 10,
   and: 11,
   not: 12,
@@ -46,10 +47,9 @@ module.exports = grammar({
     [$.primary_expression, $.list_splat_pattern],
     [$.tuple, $.tuple_pattern],
     [$.list, $.list_pattern],
-    [$.with_item, $._collection_elements],
+    [$.with_item, $.tuple],
     [$.named_expression, $.as_pattern],
     [$.print_statement, $.primary_expression],
-    [$.type_alias_statement, $.primary_expression],
     [$.match_statement, $.primary_expression],
   ],
 
@@ -62,21 +62,21 @@ module.exports = grammar({
     $.parameter,
   ],
 
-  externals: ($) => [
-    $._newline,
-    $._indent,
-    $._dedent,
-    $.string_start,
-    $._string_content,
-    $.escape_interpolation,
-    $.string_end,
+  externals: () => [
+    sym('_newline'),
+    sym('_indent'),
+    sym('_dedent'),
+    sym('string_start'),
+    sym('_string_content'),
+    sym('escape_interpolation'),
+    sym('string_end'),
 
     // Mark comments as external tokens so that the external scanner is always
     // invoked, even if no external token is expected. This allows for better
     // error recovery, because the external scanner can maintain the overall
     // structure by returning dedent tokens whenever a dedent occurs, even
     // if no dedent is expected.
-    $.comment,
+    sym('comment'),
 
     // Allow the external scanner to check for the validity of closing brackets
     // so that it can avoid returning dedent tokens between brackets.
@@ -87,6 +87,7 @@ module.exports = grammar({
   ],
 
   inline: ($) => [
+    $._expression_without_named_expression,
     $._simple_statement,
     $._compound_statement,
     $._suite,
@@ -145,7 +146,7 @@ module.exports = grammar({
 
     // Simple statements
 
-    _simple_statements: ($) => seq(sep1($._simple_statement, SEMICOLON), optional(SEMICOLON), $._newline),
+    _simple_statements: ($) => seq(sep1($._simple_statement, SEMICOLON), optional(SEMICOLON), sym('_newline')),
 
     _simple_statement: ($) =>
       choice(
@@ -192,8 +193,23 @@ module.exports = grammar({
 
     print_statement: ($) =>
       choice(
-        prec(1, seq('print', $.chevron, repeat(seq(',', field('argument', $.expression))), optional(','))),
-        prec(-3, prec.dynamic(-1, seq('print', commaSep1(field('argument', $.expression)), optional(','))))
+        // Python 3 reads these statements as expression lists, which can unpack their elements.
+        prec(
+          1,
+          seq(
+            'print',
+            $.chevron,
+            repeat(seq(',', field('argument', choice($.expression, $.list_splat)))),
+            optional(',')
+          )
+        ),
+        prec(
+          -3,
+          prec.dynamic(
+            -1,
+            seq('print', commaSep1(field('argument', choice($.expression, $.list_splat))), optional(','))
+          )
+        )
       ),
 
     chevron: ($) => seq('>>', $.expression),
@@ -201,7 +217,13 @@ module.exports = grammar({
     assert_statement: ($) => seq('assert', commaSep1($.expression)),
 
     expression_statement: ($) =>
-      choice($.expression, seq(commaSep1($.expression), optional(',')), $.assignment, $.augmented_assignment, $.yield),
+      choice(
+        $.expression,
+        seq(choice($.expression, $.list_splat), ',', optional($._collection_elements)),
+        $.assignment,
+        $.augmented_assignment,
+        $.yield
+      ),
 
     named_expression: ($) => seq(field('name', $._named_expression_lhs), ':=', field('value', $.expression)),
 
@@ -248,16 +270,18 @@ module.exports = grammar({
 
     else_clause: ($) => seq('else', ':', field('body', $._suite)),
 
-    match_statement: ($) =>
-      seq(
+    match_statement: ($) => {
+      const subject = field('subject', choice($.expression, $.list_splat));
+      return seq(
         'match',
-        commaSep1(field('subject', $.expression)),
-        optional(','),
+        choice(field('subject', $.expression), seq(subject, ',', optional(seq(commaSep1(subject), optional(','))))),
         ':',
         field('body', alias($._match_block, $.block))
-      ),
+      );
+    },
 
-    _match_block: ($) => choice(seq($._indent, repeat(field('alternative', $.case_clause)), $._dedent), $._newline),
+    _match_block: ($) =>
+      choice(seq(sym('_indent'), repeat(field('alternative', $.case_clause)), sym('_dedent')), sym('_newline')),
 
     case_clause: ($) =>
       seq(
@@ -339,9 +363,9 @@ module.exports = grammar({
 
     lambda_parameters: ($) => $._parameters,
 
-    list_splat: ($) => seq('*', $.expression),
+    list_splat: ($) => seq('*', $.primary_expression),
 
-    dictionary_splat: ($) => seq('**', $.expression),
+    dictionary_splat: ($) => seq('**', $.primary_expression),
 
     global_statement: ($) => seq('global', commaSep1($.identifier)),
 
@@ -350,7 +374,12 @@ module.exports = grammar({
     exec_statement: ($) =>
       seq('exec', field('code', choice($.string, $.identifier)), optional(seq('in', commaSep1($.expression)))),
 
-    type_alias_statement: ($) => prec.dynamic(1, seq('type', field('left', $.type), '=', field('right', $.type))),
+    type_alias_statement: ($) =>
+      seq('type', field('left', alias($._type_alias_name, $.type)), '=', field('right', $.type)),
+
+    _type_alias_name: ($) => choice($.identifier, alias($._generic_type_definition, $.generic_type)),
+
+    _generic_type_definition: ($) => seq($.identifier, $.type_parameter),
 
     class_definition: ($) =>
       seq(
@@ -361,13 +390,10 @@ module.exports = grammar({
         ':',
         field('body', $._suite)
       ),
-    type_parameter: ($) => seq('[', commaSep1($.type), optional(','), ']'),
+    type_parameter: ($) => seq('[', commaSep1(choice($.type, $.splat_type)), optional(','), ']'),
 
-    parenthesized_list_splat: ($) =>
-      prec(
-        PREC.parenthesized_list_splat,
-        seq('(', choice(alias($.parenthesized_list_splat, $.parenthesized_expression), $.list_splat), ')')
-      ),
+    _generic_type_arguments: ($) =>
+      seq('[', commaSep1(choice($.type, alias($._list_splat_argument, $.splat_type))), optional(','), ']'),
 
     argument_list: ($) =>
       seq(
@@ -376,9 +402,8 @@ module.exports = grammar({
           commaSep1(
             choice(
               $.expression,
-              $.list_splat,
-              $.dictionary_splat,
-              alias($.parenthesized_list_splat, $.parenthesized_expression),
+              alias($._list_splat_argument, $.list_splat),
+              alias($._dictionary_splat_argument, $.dictionary_splat),
               $.keyword_argument
             )
           )
@@ -387,17 +412,22 @@ module.exports = grammar({
         ')'
       ),
 
+    _list_splat_argument: ($) => seq('*', $._expression_without_named_expression),
+
+    _dictionary_splat_argument: ($) => seq('**', $._expression_without_named_expression),
+
     decorated_definition: ($) =>
       seq(repeat1($.decorator), field('definition', choice($.class_definition, $.function_definition))),
 
-    decorator: ($) => seq('@', $.expression, $._newline),
+    decorator: ($) => seq('@', $.expression, sym('_newline')),
 
-    _suite: ($) => choice(alias($._simple_statements, $.block), seq($._indent, $.block), alias($._newline, $.block)),
+    _suite: ($) =>
+      choice(alias($._simple_statements, $.block), seq(sym('_indent'), $.block), alias(sym('_newline'), $.block)),
 
-    block: ($) => seq(repeat($._statement), $._dedent),
+    block: ($) => seq(repeat($._statement), sym('_dedent')),
 
     expression_list: ($) =>
-      prec.right(seq($.expression, choice(',', seq(repeat1(seq(',', $.expression)), optional(','))))),
+      prec.dynamic(1, prec.right(seq(choice($.expression, $.list_splat), ',', optional($._collection_elements)))),
 
     dotted_name: ($) => prec(1, sep1($.identifier, '.')),
 
@@ -498,22 +528,23 @@ module.exports = grammar({
 
     // Extended patterns (patterns allowed in match statement are far more flexible than simple patterns though still a subset of "expression")
 
-    as_pattern: ($) => prec.left(seq($.expression, 'as', field('alias', alias($.expression, $.as_pattern_target)))),
+    as_pattern: ($) =>
+      prec.left(seq($.expression, 'as', field('alias', alias($.expression, sym('as_pattern_target'))))),
 
     // Expressions
 
     _expression_within_for_in_clause: ($) => choice($.expression, alias($.lambda_within_for_in_clause, $.lambda)),
 
-    expression: ($) =>
+    expression: ($) => choice($._expression_without_named_expression, $.named_expression, $.as_pattern),
+
+    _expression_without_named_expression: ($) =>
       choice(
         $.comparison_operator,
         $.not_operator,
         $.boolean_operator,
         $.lambda,
         $.primary_expression,
-        $.conditional_expression,
-        $.named_expression,
-        $.as_pattern
+        $.conditional_expression
       ),
 
     primary_expression: ($) =>
@@ -542,21 +573,33 @@ module.exports = grammar({
         $.tuple,
         $.parenthesized_expression,
         $.generator_expression,
-        $.ellipsis,
-        alias($.list_splat_pattern, $.list_splat)
+        $.ellipsis
       ),
 
-    not_operator: ($) => prec(PREC.not, seq('not', field('argument', $.expression))),
+    not_operator: ($) => prec(PREC.not, seq('not', field('argument', $._expression_without_named_expression))),
 
     boolean_operator: ($) =>
       choice(
-        prec.left(PREC.and, seq(field('left', $.expression), field('operator', 'and'), field('right', $.expression))),
-        prec.left(PREC.or, seq(field('left', $.expression), field('operator', 'or'), field('right', $.expression)))
+        prec.left(
+          PREC.and,
+          seq(
+            field('left', $._expression_without_named_expression),
+            field('operator', 'and'),
+            field('right', $._expression_without_named_expression)
+          )
+        ),
+        prec.left(
+          PREC.or,
+          seq(
+            field('left', $._expression_without_named_expression),
+            field('operator', 'or'),
+            field('right', $._expression_without_named_expression)
+          )
+        )
       ),
 
     binary_operator: ($) => {
-      /* oxlint-disable typescript/unbound-method -- prec.left and prec.right do not use `this`. */
-      /** @type {[typeof prec.left | typeof prec.right, string, number][]} */
+      /** @type {[import('@willbooster/web-tree-sitter/dsl').DSL['prec']['left' | 'right'], string, number][]} */
       const table = [
         [prec.left, '+', PREC.plus],
         [prec.left, '-', PREC.plus],
@@ -572,7 +615,6 @@ module.exports = grammar({
         [prec.left, '<<', PREC.shift],
         [prec.left, '>>', PREC.shift],
       ];
-      /* oxlint-enable typescript/unbound-method */
 
       return choice(
         ...table.map(([fn, operator, precedence]) =>
@@ -623,7 +665,12 @@ module.exports = grammar({
     lambda: ($) =>
       prec(
         PREC.lambda,
-        seq('lambda', field('parameters', optional($.lambda_parameters)), ':', field('body', $.expression))
+        seq(
+          'lambda',
+          field('parameters', optional($.lambda_parameters)),
+          ':',
+          field('body', $._expression_without_named_expression)
+        )
       ),
 
     lambda_within_for_in_clause: ($) =>
@@ -655,8 +702,7 @@ module.exports = grammar({
 
     pattern_list: ($) => seq($.pattern, choice(',', seq(repeat1(seq(',', $.pattern)), optional(',')))),
 
-    _right_hand_side: ($) =>
-      choice($.expression, $.expression_list, $.assignment, $.augmented_assignment, $.pattern_list, $.yield),
+    _right_hand_side: ($) => choice($.expression, $.expression_list, $.assignment, $.augmented_assignment, $.yield),
 
     yield: ($) => prec.right(seq('yield', choice(seq('from', $.expression), optional($._expressions)))),
 
@@ -669,7 +715,7 @@ module.exports = grammar({
         seq(
           field('value', $.primary_expression),
           '[',
-          commaSep1(field('subscript', choice($.expression, $.slice))),
+          commaSep1(field('subscript', choice($.expression, alias($._list_splat_argument, $.list_splat), $.slice))),
           optional(','),
           ']'
         )
@@ -691,13 +737,19 @@ module.exports = grammar({
     typed_parameter: ($) =>
       prec(
         PREC.typed_parameter,
-        seq(choice($.identifier, $.list_splat_pattern, $.dictionary_splat_pattern), ':', field('type', $.type))
+        choice(
+          seq(choice($.identifier, $.dictionary_splat_pattern), ':', field('type', $.type)),
+          seq($.list_splat_pattern, ':', field('type', choice($.type, alias($.list_splat, $.splat_type))))
+        )
       ),
 
-    type: ($) =>
-      choice(prec(1, $.expression), $.splat_type, $.generic_type, $.union_type, $.constrained_type, $.member_type),
+    type: ($) => choice(prec(1, $.expression), $.generic_type, $.union_type, $.constrained_type, $.member_type),
     splat_type: ($) => prec(1, seq(choice('*', '**'), $.identifier)),
-    generic_type: ($) => prec(1, seq(choice($.identifier, alias('type', $.identifier)), $.type_parameter)),
+    generic_type: ($) =>
+      prec(
+        1,
+        seq(choice($.identifier, alias('type', $.identifier)), alias($._generic_type_arguments, $.type_parameter))
+      ),
     union_type: ($) => prec.left(seq($.type, '|', $.type)),
     constrained_type: ($) => prec.right(seq($.type, ':', $.type)),
     member_type: ($) => seq($.type, '.', $.identifier),
@@ -711,26 +763,40 @@ module.exports = grammar({
 
     set: ($) => seq('{', $._collection_elements, '}'),
 
-    tuple: ($) => seq('(', optional($._collection_elements), ')'),
+    tuple: ($) =>
+      seq('(', optional(seq(choice($.expression, $.list_splat), ',', optional($._collection_elements))), ')'),
 
     dictionary: ($) => seq('{', optional(commaSep1(choice($.pair, $.dictionary_splat))), optional(','), '}'),
 
     pair: ($) => seq(field('key', $.expression), ':', field('value', $.expression)),
 
-    list_comprehension: ($) => seq('[', field('body', $.expression), $._comprehension_clauses, ']'),
+    list_comprehension: ($) =>
+      seq('[', field('body', choice($.expression, $.list_splat)), $._comprehension_clauses, ']'),
 
-    dictionary_comprehension: ($) => seq('{', field('body', $.pair), $._comprehension_clauses, '}'),
+    dictionary_comprehension: ($) =>
+      seq(
+        '{',
+        field('body', choice($.pair, alias($._dictionary_splat_argument, $.dictionary_splat))),
+        $._comprehension_clauses,
+        '}'
+      ),
 
-    set_comprehension: ($) => seq('{', field('body', $.expression), $._comprehension_clauses, '}'),
+    set_comprehension: ($) =>
+      seq('{', field('body', choice($.expression, $.list_splat)), $._comprehension_clauses, '}'),
 
-    generator_expression: ($) => seq('(', field('body', $.expression), $._comprehension_clauses, ')'),
+    generator_expression: ($) =>
+      seq(
+        '(',
+        field('body', choice($.expression, alias($._list_splat_argument, $.list_splat))),
+        $._comprehension_clauses,
+        ')'
+      ),
 
     _comprehension_clauses: ($) => seq($.for_in_clause, repeat(choice($.for_in_clause, $.if_clause))),
 
     parenthesized_expression: ($) => prec(PREC.parenthesized_expression, seq('(', choice($.expression, $.yield), ')')),
 
-    _collection_elements: ($) =>
-      seq(commaSep1(choice($.expression, $.yield, $.list_splat, $.parenthesized_list_splat)), optional(',')),
+    _collection_elements: ($) => seq(commaSep1(choice($.expression, $.list_splat)), optional(',')),
 
     for_in_clause: ($) =>
       prec.left(
@@ -747,14 +813,25 @@ module.exports = grammar({
     if_clause: ($) => seq('if', $.expression),
 
     conditional_expression: ($) =>
-      prec.right(PREC.conditional, seq($.expression, 'if', $.expression, 'else', $.expression)),
+      prec.right(
+        PREC.conditional,
+        seq(
+          $._expression_without_named_expression,
+          'if',
+          $._expression_without_named_expression,
+          'else',
+          $._expression_without_named_expression
+        )
+      ),
 
     concatenated_string: ($) => seq($.string, repeat1($.string)),
 
-    string: ($) => seq($.string_start, repeat(choice($.interpolation, $.string_content)), $.string_end),
+    string: ($) => seq(sym('string_start'), repeat(choice($.interpolation, $.string_content)), sym('string_end')),
 
     string_content: ($) =>
-      prec.right(repeat1(choice($.escape_interpolation, $.escape_sequence, $._not_escape_sequence, $._string_content))),
+      prec.right(
+        repeat1(choice(sym('escape_interpolation'), $.escape_sequence, $._not_escape_sequence, sym('_string_content')))
+      ),
 
     interpolation: ($) =>
       seq(
@@ -766,7 +843,7 @@ module.exports = grammar({
         '}'
       ),
 
-    _f_expression: ($) => choice($.expression, $.expression_list, $.pattern_list, $.yield),
+    _f_expression: ($) => choice($.expression, $.expression_list, $.yield),
 
     escape_sequence: () =>
       token.immediate(
@@ -790,7 +867,7 @@ module.exports = grammar({
     _not_escape_sequence: () => token.immediate('\\'),
 
     format_specifier: ($) =>
-      seq(':', repeat(choice(token(prec(1, /[^{}\n]+/)), alias($.interpolation, $.format_expression)))),
+      seq(':', repeat(choice(token(prec(1, /[^{}\n]+/)), alias($.interpolation, sym('format_expression'))))),
 
     type_conversion: () => /![a-z]/,
 
@@ -859,9 +936,9 @@ Object.assign(module.exports, { PREC });
 /**
  * Creates a rule to match one or more of the rules separated by a comma
  *
- * @param {RuleOrLiteral} rule
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleOrLiteral} rule
  *
- * @returns {SeqRule}
+ * @returns {import('@willbooster/web-tree-sitter/dsl').SeqRule}
  */
 function commaSep1(rule) {
   return sep1(rule, ',');
@@ -870,11 +947,11 @@ function commaSep1(rule) {
 /**
  * Creates a rule to match one or more occurrences of `rule` separated by `sep`
  *
- * @param {RuleOrLiteral} rule
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleOrLiteral} rule
  *
- * @param {RuleOrLiteral} separator
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleOrLiteral} separator
  *
- * @returns {SeqRule}
+ * @returns {import('@willbooster/web-tree-sitter/dsl').SeqRule}
  */
 function sep1(rule, separator) {
   return seq(rule, repeat(seq(separator, rule)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-python",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "Python grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -46,21 +46,19 @@
     "@vitest/browser-playwright": "5.0.3",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.24.0",
-    "@willbooster/web-tree-sitter": "2.0.1",
-    "conventional-changelog-conventionalcommits": "10.4.0",
-    "lefthook": "2.1.16",
-    "oxfmt": "0.71.0",
-    "oxlint": "1.86.0",
-    "oxlint-tsgolint": "7.0.2003",
-    "playwright": "1.63.0",
+    "@willbooster/wb": "22.26.1",
+    "@willbooster/web-tree-sitter": "2.0.27",
+    "conventional-changelog-conventionalcommits": "10.4.1",
+    "lefthook": "2.2.1",
+    "oxfmt": "0.72.0",
+    "oxlint": "1.87.0",
+    "oxlint-tsgolint": "7.0.2004",
+    "playwright": "1.64.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "tree-sitter-cli": "0.27.0",
-    "typescript": "7.0.2",
-    "vite": "8.3.2",
+    "vite": "8.3.4",
     "vitest": "5.0.3",
-    "wrangler": "4.147.0"
+    "wrangler": "4.149.0"
   },
   "peerDependencies": {
     "@willbooster/web-tree-sitter": "^2.0.0"

package/src/node-types.json

@@ -173,10 +173,6 @@
         "type": "list_comprehension",
         "named": true
       },
-      {
-        "type": "list_splat",
-        "named": true
-      },
       {
         "type": "none",
         "named": true
@@ -264,10 +260,6 @@
         {
           "type": "list_splat",
           "named": true
-        },
-        {
-          "type": "parenthesized_expression",
-          "named": true
         }
       ]
     }
@@ -402,10 +394,6 @@
             "type": "expression_list",
             "named": true
           },
-          {
-            "type": "pattern_list",
-            "named": true
-          },
           {
             "type": "yield",
             "named": true
@@ -546,10 +534,6 @@
             "type": "expression_list",
             "named": true
           },
-          {
-            "type": "pattern_list",
-            "named": true
-          },
           {
             "type": "yield",
             "named": true
@@ -788,7 +772,27 @@
         "required": true,
         "types": [
           {
-            "type": "expression",
+            "type": "boolean_operator",
+            "named": true
+          },
+          {
+            "type": "comparison_operator",
+            "named": true
+          },
+          {
+            "type": "conditional_expression",
+            "named": true
+          },
+          {
+            "type": "lambda",
+            "named": true
+          },
+          {
+            "type": "not_operator",
+            "named": true
+          },
+          {
+            "type": "primary_expression",
             "named": true
           }
         ]
@@ -812,7 +816,27 @@
         "required": true,
         "types": [
           {
-            "type": "expression",
+            "type": "boolean_operator",
+            "named": true
+          },
+          {
+            "type": "comparison_operator",
+            "named": true
+          },
+          {
+            "type": "conditional_expression",
+            "named": true
+          },
+          {
+            "type": "lambda",
+            "named": true
+          },
+          {
+            "type": "not_operator",
+            "named": true
+          },
+          {
+            "type": "primary_expression",
             "named": true
           }
         ]
@@ -1158,7 +1182,27 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "boolean_operator",
+          "named": true
+        },
+        {
+          "type": "comparison_operator",
+          "named": true
+        },
+        {
+          "type": "conditional_expression",
+          "named": true
+        },
+        {
+          "type": "lambda",
+          "named": true
+        },
+        {
+          "type": "not_operator",
+          "named": true
+        },
+        {
+          "type": "primary_expression",
           "named": true
         }
       ]
@@ -1405,6 +1449,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "dictionary_splat",
+            "named": true
+          },
           {
             "type": "pair",
             "named": true
@@ -1436,7 +1484,27 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "boolean_operator",
+          "named": true
+        },
+        {
+          "type": "comparison_operator",
+          "named": true
+        },
+        {
+          "type": "conditional_expression",
+          "named": true
+        },
+        {
+          "type": "lambda",
+          "named": true
+        },
+        {
+          "type": "not_operator",
+          "named": true
+        },
+        {
+          "type": "primary_expression",
           "named": true
         }
       ]
@@ -1599,6 +1667,10 @@
         {
           "type": "expression",
           "named": true
+        },
+        {
+          "type": "list_splat",
+          "named": true
         }
       ]
     }
@@ -1623,6 +1695,10 @@
           "type": "expression",
           "named": true
         },
+        {
+          "type": "list_splat",
+          "named": true
+        },
         {
           "type": "yield",
           "named": true
@@ -1749,10 +1825,6 @@
             "type": "expression_list",
             "named": true
           },
-          {
-            "type": "pattern_list",
-            "named": true
-          },
           {
             "type": "yield",
             "named": true
@@ -1883,6 +1955,10 @@
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
           }
         ]
       }
@@ -2076,10 +2152,6 @@
             "type": "expression_list",
             "named": true
           },
-          {
-            "type": "pattern_list",
-            "named": true
-          },
           {
             "type": "yield",
             "named": true
@@ -2275,14 +2347,6 @@
         {
           "type": "list_splat",
           "named": true
-        },
-        {
-          "type": "parenthesized_list_splat",
-          "named": true
-        },
-        {
-          "type": "yield",
-          "named": true
         }
       ]
     }
@@ -2298,6 +2362,10 @@
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
           }
         ]
       }
@@ -2345,19 +2413,27 @@
       "required": true,
       "types": [
         {
-          "type": "attribute",
+          "type": "boolean_operator",
           "named": true
         },
         {
-          "type": "expression",
+          "type": "comparison_operator",
           "named": true
         },
         {
-          "type": "identifier",
+          "type": "conditional_expression",
           "named": true
         },
         {
-          "type": "subscript",
+          "type": "lambda",
+          "named": true
+        },
+        {
+          "type": "not_operator",
+          "named": true
+        },
+        {
+          "type": "primary_expression",
           "named": true
         }
       ]
@@ -2407,6 +2483,10 @@
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
           }
         ]
       }
@@ -2598,7 +2678,27 @@
         "required": true,
         "types": [
           {
-            "type": "expression",
+            "type": "boolean_operator",
+            "named": true
+          },
+          {
+            "type": "comparison_operator",
+            "named": true
+          },
+          {
+            "type": "conditional_expression",
+            "named": true
+          },
+          {
+            "type": "lambda",
+            "named": true
+          },
+          {
+            "type": "not_operator",
+            "named": true
+          },
+          {
+            "type": "primary_expression",
             "named": true
           }
         ]
@@ -2658,14 +2758,6 @@
           "type": "expression",
           "named": true
         },
-        {
-          "type": "list_splat",
-          "named": true
-        },
-        {
-          "type": "parenthesized_expression",
-          "named": true
-        },
         {
           "type": "yield",
           "named": true
@@ -2673,25 +2765,6 @@
       ]
     }
   },
-  {
-    "type": "parenthesized_list_splat",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "list_splat",
-          "named": true
-        },
-        {
-          "type": "parenthesized_expression",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "pass_statement",
     "named": true,
@@ -2728,6 +2801,10 @@
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
           }
         ]
       }
@@ -2826,14 +2903,6 @@
         {
           "type": "list_splat",
           "named": true
-        },
-        {
-          "type": "parenthesized_list_splat",
-          "named": true
-        },
-        {
-          "type": "yield",
-          "named": true
         }
       ]
     }
@@ -2849,6 +2918,10 @@
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "list_splat",
+            "named": true
           }
         ]
       }
@@ -2907,7 +2980,27 @@
       "required": true,
       "types": [
         {
-          "type": "identifier",
+          "type": "boolean_operator",
+          "named": true
+        },
+        {
+          "type": "comparison_operator",
+          "named": true
+        },
+        {
+          "type": "conditional_expression",
+          "named": true
+        },
+        {
+          "type": "lambda",
+          "named": true
+        },
+        {
+          "type": "not_operator",
+          "named": true
+        },
+        {
+          "type": "primary_expression",
           "named": true
         }
       ]
@@ -2971,6 +3064,10 @@
             "type": "expression",
             "named": true
           },
+          {
+            "type": "list_splat",
+            "named": true
+          },
           {
             "type": "slice",
             "named": true
@@ -3038,14 +3135,6 @@
         {
           "type": "list_splat",
           "named": true
-        },
-        {
-          "type": "parenthesized_list_splat",
-          "named": true
-        },
-        {
-          "type": "yield",
-          "named": true
         }
       ]
     }
@@ -3090,11 +3179,11 @@
           "named": true
         },
         {
-          "type": "member_type",
+          "type": "identifier",
           "named": true
         },
         {
-          "type": "splat_type",
+          "type": "member_type",
           "named": true
         },
         {
@@ -3138,6 +3227,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "splat_type",
+          "named": true
+        },
         {
           "type": "type",
           "named": true
@@ -3189,6 +3282,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "splat_type",
+            "named": true
+          },
           {
             "type": "type",
             "named": true

package/tree-sitter.json

@@ -19,7 +19,7 @@
     }
   ],
   "metadata": {
-    "version": "2.0.2",
+    "version": "2.1.1",
     "license": "MIT",
     "description": "Python grammar for tree-sitter",
     "authors": [