sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '78c4e9b6b2f08e1be23b541ffced47b15e2972ad'

pull/261/head
Wilfred Hughes 2022-04-17 16:57:45 +07:00
parent d9b9ec45a8 78c4e9b6b2
commit f03e7f063f
13 changed files with 46765 additions and 31937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
Unescape Escape View File

@ -6,8 +6,8 @@ Added support for Kotlin and TOML.
Fixed an issue with YAML and `|` block strings.
Updated to the latest upstream C++, C#, Elixir, Go, Haskell and Java
parsers.
Updated to the latest upstream C++, C#, Elixir, Go, Haskell, Java and
Python parsers.
### Diffing

69
vendor/tree-sitter-python/grammar.js vendored
Unescape Escape View File

@ -38,6 +38,8 @@ module.exports = grammar({
[$.tuple, $.tuple_pattern],
[$.list, $.list_pattern],
[$.with_item, $._collection_elements],
[$.named_expression, $.as_pattern],
[$.match_statement, $.primary_expression],
],
supertypes: $ => [
@ -188,11 +190,16 @@ module.exports = grammar({
),
named_expression: $ => seq(
field('name', $.identifier),
field('name', $._named_expresssion_lhs),
':=',
field('value', $.expression)
),
_named_expresssion_lhs: $ => choice(
$.identifier,
alias('match', $.identifier), // ambiguity with match statement: only ":" at end of line decides if "match" keyword
),
return_statement: $ => seq(
'return',
optional($._expressions)
@ -228,7 +235,8 @@ module.exports = grammar({
$.with_statement,
$.function_definition,
$.class_definition,
$.decorated_definition
$.decorated_definition,
$.match_statement,
),
if_statement: $ => seq(
@ -253,6 +261,27 @@ module.exports = grammar({
field('body', $._suite)
),
match_statement: $ => seq(
'match',
commaSep1(field('subject', $.expression)),
optional(','),
':',
repeat(field('alternative', $.case_clause))),
case_clause: $ => seq(
'case',
commaSep1(
field(
'pattern',
alias(choice($.expression, $.list_splat_pattern), $.case_pattern),
)
),
optional(','),
optional(field('guard', $.if_clause)),
':',
field('consequence', $._suite)
),
for_statement: $ => seq(
optional('async'),
'for',
@ -320,10 +349,6 @@ module.exports = grammar({
with_item: $ => prec.dynamic(-1, seq(
field('value', $.expression),
optional(seq(
'as',
field('alias', $.pattern)
))
)),
function_definition: $ => seq(
@ -472,12 +497,14 @@ module.exports = grammar({
$.typed_default_parameter,
$.list_splat_pattern,
$.tuple_pattern,
alias('*', $.list_splat_pattern),
$.keyword_separator,
$.positional_separator,
$.dictionary_splat_pattern
),
pattern: $ => choice(
$.identifier,
alias('match', $.identifier), // ambiguity with match statement: only ":" at end of line decides if "match" keyword
$.keyword_identifier,
$.subscript,
$.attribute,
@ -522,6 +549,14 @@ module.exports = grammar({
choice($.identifier, $.keyword_identifier, $.subscript, $.attribute)
),
// 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))
)),
// Expressions
_expression_within_for_in_clause: $ => choice(
@ -537,12 +572,14 @@ module.exports = grammar({
$.lambda,
$.primary_expression,
$.conditional_expression,
$.named_expression
$.named_expression,
$.as_pattern
),
primary_expression: $ => choice(
$.binary_operator,
$.identifier,
alias("match", $.identifier),
$.keyword_identifier,
$.string,
$.concatenated_string,
@ -631,8 +668,8 @@ module.exports = grammar({
'is',
seq('is', 'not')
)),
$.primary_expression
))
$.primary_expression
))
)),
lambda: $ => prec(PREC.lambda, seq(
@ -669,7 +706,7 @@ module.exports = grammar({
_left_hand_side: $ => choice(
$.pattern,
$.pattern_list
$.pattern_list,
),
pattern_list: $ => seq(
@ -749,7 +786,7 @@ module.exports = grammar({
type: $ => $.expression,
keyword_argument: $ => seq(
field('name', choice($.identifier, $.keyword_identifier)),
field('name', choice($.identifier, $.keyword_identifier, alias("match", $.identifier))),
'=',
field('value', $.expression)
),
@ -872,6 +909,7 @@ module.exports = grammar({
interpolation: $ => seq(
'{',
$.expression,
optional('='),
optional($.type_conversion),
optional($.format_specifier),
'}'
@ -966,13 +1004,16 @@ module.exports = grammar({
)),
comment: $ => token(seq('#', /.*/)),
positional_separator: $ => '/',
keyword_separator: $ => '*',
}
})
function commaSep1 (rule) {
function commaSep1(rule) {
return sep1(rule, ',')
}
function sep1 (rule, separator) {
function sep1(rule, separator) {
return seq(rule, repeat(seq(separator, rule)))
}

4
vendor/tree-sitter-python/package.json vendored
Unescape Escape View File

@ -10,10 +10,10 @@
"author": "Max Brunsfeld",
"license": "MIT",
"dependencies": {
"nan": "^2.14.0"
"nan": "^2.15.0"
},
"devDependencies": {
"tree-sitter-cli": "^0.19.3"
"tree-sitter-cli": "^0.20.1"
},
"scripts": {
"build": "tree-sitter generate && node-gyp build",

2
vendor/tree-sitter-python/queries/highlights.scm vendored
Unescape Escape View File

@ -121,4 +121,6 @@
"while"
"with"
"yield"
"match"
"case"
] @keyword

330
vendor/tree-sitter-python/src/grammar.json vendored
Unescape Escape View File

@ -604,7 +604,7 @@
"name": "name",
"content": {
"type": "SYMBOL",
"name": "identifier"
"name": "_named_expresssion_lhs"
}
},
{
@ -621,6 +621,24 @@
}
]
},
"_named_expresssion_lhs": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "identifier"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "match"
},
"named": true,
"value": "identifier"
}
]
},
"return_statement": {
"type": "SEQ",
"members": [
@ -772,6 +790,10 @@
{
"type": "SYMBOL",
"name": "decorated_definition"
},
{
"type": "SYMBOL",
"name": "match_statement"
}
]
},
@ -881,6 +903,185 @@
}
]
},
"match_statement": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "match"
},
{
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "subject",
"content": {
"type": "SYMBOL",
"name": "expression"
}
},
{
"type": "REPEAT",
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "FIELD",
"name": "subject",
"content": {
"type": "SYMBOL",
"name": "expression"
}
}
]
}
}
]
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
},
{
"type": "STRING",
"value": ":"
},
{
"type": "REPEAT",
"content": {
"type": "FIELD",
"name": "alternative",
"content": {
"type": "SYMBOL",
"name": "case_clause"
}
}
}
]
},
"case_clause": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "case"
},
{
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "pattern",
"content": {
"type": "ALIAS",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "SYMBOL",
"name": "list_splat_pattern"
}
]
},
"named": true,
"value": "case_pattern"
}
},
{
"type": "REPEAT",
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "FIELD",
"name": "pattern",
"content": {
"type": "ALIAS",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "SYMBOL",
"name": "list_splat_pattern"
}
]
},
"named": true,
"value": "case_pattern"
}
}
]
}
}
]
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
},
{
"type": "CHOICE",
"members": [
{
"type": "FIELD",
"name": "guard",
"content": {
"type": "SYMBOL",
"name": "if_clause"
}
},
{
"type": "BLANK"
}
]
},
{
"type": "STRING",
"value": ":"
},
{
"type": "FIELD",
"name": "consequence",
"content": {
"type": "SYMBOL",
"name": "_suite"
}
}
]
},
"for_statement": {
"type": "SEQ",
"members": [
@ -1260,31 +1461,6 @@
"type": "SYMBOL",
"name": "expression"
}
},
{
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "as"
},
{
"type": "FIELD",
"name": "alias",
"content": {
"type": "SYMBOL",
"name": "pattern"
}
}
]
},
{
"type": "BLANK"
}
]
}
]
}
@ -2025,13 +2201,12 @@
"name": "tuple_pattern"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "*"
},
"named": true,
"value": "list_splat_pattern"
"type": "SYMBOL",
"name": "keyword_separator"
},
{
"type": "SYMBOL",
"name": "positional_separator"
},
{
"type": "SYMBOL",
@ -2046,6 +2221,15 @@
"type": "SYMBOL",
"name": "identifier"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "match"
},
"named": true,
"value": "identifier"
},
{
"type": "SYMBOL",
"name": "keyword_identifier"
@ -2248,6 +2432,36 @@
}
]
},
"as_pattern": {
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "STRING",
"value": "as"
},
{
"type": "FIELD",
"name": "alias",
"content": {
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "expression"
},
"named": true,
"value": "as_pattern_target"
}
}
]
}
},
"_expression_within_for_in_clause": {
"type": "CHOICE",
"members": [
@ -2300,6 +2514,10 @@
{
"type": "SYMBOL",
"name": "named_expression"
},
{
"type": "SYMBOL",
"name": "as_pattern"
}
]
},
@ -2314,6 +2532,15 @@
"type": "SYMBOL",
"name": "identifier"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "match"
},
"named": true,
"value": "identifier"
},
{
"type": "SYMBOL",
"name": "keyword_identifier"
@ -3712,6 +3939,15 @@
{
"type": "SYMBOL",
"name": "keyword_identifier"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "match"
},
"named": true,
"value": "identifier"
}
]
}
@ -4327,6 +4563,18 @@
"type": "SYMBOL",
"name": "expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "="
},
{
"type": "BLANK"
}
]
},
{
"type": "CHOICE",
"members": [
@ -4882,6 +5130,14 @@
}
]
}
},
"positional_separator": {
"type": "STRING",
"value": "/"
},
"keyword_separator": {
"type": "STRING",
"value": "*"
}
},
"extras": [
@ -4914,6 +5170,14 @@
[
"with_item",
"_collection_elements"
],
[
"named_expression",
"as_pattern"
],
[
"match_statement",
"primary_expression"
]
],
"precedences": [],

157
vendor/tree-sitter-python/src/node-types.json vendored
Unescape Escape View File

@ -23,6 +23,10 @@
"type": "if_statement",
"named": true
},
{
"type": "match_statement",
"named": true
},
{
"type": "try_statement",
"named": true
@ -107,6 +111,10 @@
"type": "expression",
"named": true,
"subtypes": [
{
"type": "as_pattern",
"named": true
},
{
"type": "await",
"named": true
@ -157,10 +165,18 @@
"type": "identifier",
"named": true
},
{
"type": "keyword_separator",
"named": true
},
{
"type": "list_splat_pattern",
"named": true
},
{
"type": "positional_separator",
"named": true
},
{
"type": "tuple_pattern",
"named": true
@ -360,6 +376,32 @@
]
}
},
{
"type": "as_pattern",
"named": true,
"fields": {
"alias": {
"multiple": false,
"required": true,
"types": [
{
"type": "as_pattern_target",
"named": true
}
]
}
},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "expression",
"named": true
}
]
}
},
{
"type": "assert_statement",
"named": true,
@ -754,6 +796,65 @@
}
}
},
{
"type": "case_clause",
"named": true,
"fields": {
"consequence": {
"multiple": false,
"required": true,
"types": [
{
"type": "block",
"named": true
}
]
},
"guard": {
"multiple": false,
"required": false,
"types": [
{
"type": "if_clause",
"named": true
}
]
},
"pattern": {
"multiple": true,
"required": true,
"types": [
{
"type": "case_pattern",
"named": true
}
]
}
}
},
{
"type": "case_pattern",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "attribute",
"named": true
},
{
"type": "identifier",
"named": true
},
{
"type": "subscript",
"named": true
}
]
}
},
{
"type": "chevron",
"named": true,
@ -1640,6 +1741,11 @@
}
}
},
{
"type": "keyword_separator",
"named": true,
"fields": {}
},
{
"type": "lambda",
"named": true,
@ -1774,7 +1880,7 @@
"fields": {},
"children": {
"multiple": false,
"required": false,
"required": true,
"types": [
{
"type": "attribute",
@ -1791,6 +1897,32 @@
]
}
},
{
"type": "match_statement",
"named": true,
"fields": {
"alternative": {
"multiple": true,
"required": false,
"types": [
{
"type": "case_clause",
"named": true
}
]
},
"subject": {
"multiple": true,
"required": true,
"types": [
{
"type": "expression",
"named": true
}
]
}
}
},
{
"type": "module",
"named": true,
@ -1974,6 +2106,11 @@
]
}
},
{
"type": "positional_separator",
"named": true,
"fields": {}
},
{
"type": "print_statement",
"named": true,
@ -2444,16 +2581,6 @@
"type": "with_item",
"named": true,
"fields": {
"alias": {
"multiple": false,
"required": false,
"types": [
{
"type": "pattern",
"named": true
}
]
},
"value": {
"multiple": false,
"required": true,
@ -2711,6 +2838,10 @@
"type": "break",
"named": false
},
{
"type": "case",
"named": false
},
{
"type": "class",
"named": false
@ -2807,6 +2938,10 @@
"type": "lambda",
"named": false
},
{
"type": "match",
"named": false
},
{
"type": "none",
"named": true

75389
vendor/tree-sitter-python/src/parser.c vendored
View File

File diff suppressed because it is too large Load Diff

635
vendor/tree-sitter-python/test/corpus/expressions.txt vendored
View File

File diff suppressed because it is too large Load Diff

580
vendor/tree-sitter-python/test/corpus/literals.txt vendored
Unescape Escape View File

@ -1,6 +1,6 @@
=====================================
================================================================================
Integers
=====================================
================================================================================
-1
0xDEAD
@ -16,26 +16,41 @@ Integers
0O1_1
0L
---
--------------------------------------------------------------------------------
(module
(expression_statement (unary_operator (integer)))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (unary_operator (integer)))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer))
(expression_statement (integer)))
=====================================
(expression_statement
(unary_operator
(integer)))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(unary_operator
(integer)))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer))
(expression_statement
(integer)))
================================================================================
Floats
=====================================
================================================================================
-.6_6
+.1_1
@ -48,24 +63,35 @@ Floats
1_0.l
.1l
---
--------------------------------------------------------------------------------
(module
(expression_statement (unary_operator (float)))
(expression_statement (unary_operator (float)))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float)))
=====================================
(expression_statement
(unary_operator
(float)))
(expression_statement
(unary_operator
(float)))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float)))
================================================================================
Scientific Notation Floats
=====================================
================================================================================
1e322
1e-3
@ -74,19 +100,26 @@ Scientific Notation Floats
1.e10
-1e10
---
--------------------------------------------------------------------------------
(module
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (float))
(expression_statement (unary_operator (float))))
=====================================
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(float))
(expression_statement
(unary_operator
(float))))
================================================================================
Strings
=====================================
================================================================================
"I'm ok"
'"ok"'
@ -102,25 +135,53 @@ b"\x12\u12\U12\x13\N{WINKING FACE}"
"\xab\123\'\"\a\b\f\r\n\t\v\\"
"\xgh\o123\p\q\c\d\e\u12\U1234"
---
--------------------------------------------------------------------------------
(module
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string (escape_sequence)))
(expression_statement (string))
(expression_statement (string (escape_sequence)))
(expression_statement (string (escape_sequence) (escape_sequence)))
(expression_statement (string (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence) (escape_sequence)))
(expression_statement (string)))
=====================================
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string
(escape_sequence)))
(expression_statement
(string))
(expression_statement
(string
(escape_sequence)))
(expression_statement
(string
(escape_sequence)
(escape_sequence)))
(expression_statement
(string
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)))
(expression_statement
(string)))
================================================================================
Raw strings
=====================================
================================================================================
'ab\x00cd'
"\n"
@ -129,34 +190,44 @@ Raw strings
r'ab\x00cd'
ur"\n"
---
--------------------------------------------------------------------------------
(module
(expression_statement (string (escape_sequence)))
(expression_statement (string (escape_sequence)))
(expression_statement
(string
(escape_sequence)))
(expression_statement
(string
(escape_sequence)))
(comment)
(expression_statement (string))
(expression_statement (string)))
(expression_statement
(string))
(expression_statement
(string)))
=====================================
================================================================================
Raw strings with escaped quotes
=====================================
================================================================================
re.compile(r"(\n|\A)#include\s*['\"]"
r"(?P<name>[\w\d./\\]+[.]src)['\"]")
---
--------------------------------------------------------------------------------
(module
(expression_statement
(call
(attribute (identifier) (identifier))
(attribute
(identifier)
(identifier))
(argument_list
(concatenated_string (string) (string))))))
(concatenated_string
(string)
(string))))))
=====================================
================================================================================
Format strings
=====================================
================================================================================
# nested!
f"a {b(f'c {e} d')} e"
@ -168,7 +239,7 @@ f"a {{{b}"
f"a {{b}}"
f"a {{{b}}}"
---
--------------------------------------------------------------------------------
(module
(comment)
@ -206,68 +277,89 @@ f"a {{{b}}}"
(interpolation
(identifier)))))
======================================
================================================================================
Format strings with format specifiers
======================================
================================================================================
f"a {b:2} {c:34.5}"
f"{b:{c.d}.{d.e}}"
f"{a:#06x}"
f"{a=}"
f"{a=:.2f}"
---
--------------------------------------------------------------------------------
(module
(expression_statement
(string
(interpolation (identifier) (format_specifier))
(interpolation (identifier) (format_specifier))))
(interpolation
(identifier)
(format_specifier))
(interpolation
(identifier)
(format_specifier))))
(expression_statement
(string
(interpolation
(identifier)
(format_specifier
(format_expression (attribute (identifier) (identifier)))
(format_expression (attribute (identifier) (identifier)))))))
(format_expression
(attribute
(identifier)
(identifier)))
(format_expression
(attribute
(identifier)
(identifier)))))))
(expression_statement
(string
(interpolation (identifier) (format_specifier))))
(expression_statement
(string (interpolation (identifier))))
(expression_statement
(string
(interpolation (identifier) (format_specifier)))))
=====================================
================================================================================
Unicode escape sequences
=====================================
================================================================================
"\x12 \123 \u1234"
---
--------------------------------------------------------------------------------
(module
(expression_statement (string
(escape_sequence)
(escape_sequence)
(escape_sequence))))
(expression_statement
(string
(escape_sequence)
(escape_sequence)
(escape_sequence))))
=====================================
================================================================================
Other primitives
=====================================
================================================================================
True
False
None
---
--------------------------------------------------------------------------------
(module
(expression_statement (true))
(expression_statement (false))
(expression_statement (none)))
(expression_statement
(true))
(expression_statement
(false))
(expression_statement
(none)))
=====================================
================================================================================
Concatenated strings
=====================================
================================================================================
"one" "two" "three"
---
--------------------------------------------------------------------------------
(module
(expression_statement
@ -276,9 +368,9 @@ Concatenated strings
(string)
(string))))
=====================================
================================================================================
Multi-line strings
=====================================
================================================================================
"""
A double quote hello,
@ -316,26 +408,33 @@ with an escaped newline\n\
and another escaped newline\n\
"""
---
--------------------------------------------------------------------------------
(module
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string))
(expression_statement (string
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence))))
=====================================
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string))
(expression_statement
(string
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence)
(escape_sequence))))
================================================================================
Lists
=====================================
================================================================================
[a, b, [c, d]]
[*()]
@ -345,7 +444,7 @@ Lists
[*a[b].c]
[*a()]
---
--------------------------------------------------------------------------------
(module
(expression_statement
@ -355,30 +454,61 @@ Lists
(list
(identifier)
(identifier))))
(expression_statement (list (list_splat (tuple))))
(expression_statement (list (list_splat (list))))
(expression_statement (list (list_splat (identifier))))
(expression_statement (list (list_splat (attribute (identifier) (identifier)))))
(expression_statement (list (list_splat (attribute (subscript (identifier) (identifier)) (identifier)))))
(expression_statement (list (list_splat (call (identifier) (argument_list))))))
=====================================
(expression_statement
(list
(list_splat
(tuple))))
(expression_statement
(list
(list_splat
(list))))
(expression_statement
(list
(list_splat
(identifier))))
(expression_statement
(list
(list_splat
(attribute
(identifier)
(identifier)))))
(expression_statement
(list
(list_splat
(attribute
(subscript
(identifier)
(identifier))
(identifier)))))
(expression_statement
(list
(list_splat
(call
(identifier)
(argument_list))))))
================================================================================
List comprehensions
=====================================
================================================================================
[a + b for (a, b) in items]
[a for b in c for a in b]
[(x,y) for x in [1,2,3] for y in [1,2,3] if True]
[a for a in lambda: True, lambda: False if a()]
---
--------------------------------------------------------------------------------
(module
(expression_statement
(list_comprehension
(binary_operator (identifier) (identifier))
(binary_operator
(identifier)
(identifier))
(for_in_clause
(tuple_pattern (identifier) (identifier)) (identifier))))
(tuple_pattern
(identifier)
(identifier))
(identifier))))
(expression_statement
(list_comprehension
(identifier)
@ -390,23 +520,40 @@ List comprehensions
(identifier))))
(expression_statement
(list_comprehension
(tuple (identifier) (identifier))
(for_in_clause (identifier)
(list (integer) (integer) (integer)))
(for_in_clause (identifier)
(list (integer) (integer) (integer)))
(if_clause (true))))
(tuple
(identifier)
(identifier))
(for_in_clause
(identifier)
(list
(integer)
(integer)
(integer)))
(for_in_clause
(identifier)
(list
(integer)
(integer)
(integer)))
(if_clause
(true))))
(expression_statement
(list_comprehension
(identifier)
(for_in_clause (identifier)
(lambda (true))
(lambda (false)))
(if_clause (call (identifier) (argument_list))))))
(for_in_clause
(identifier)
(lambda
(true))
(lambda
(false)))
(if_clause
(call
(identifier)
(argument_list))))))
=====================================
================================================================================
Dictionaries
=====================================
================================================================================
{a: 1, b: 2}
{}
@ -416,77 +563,122 @@ Dictionaries
{**a[b].c}
{**a()}
---
--------------------------------------------------------------------------------
(module
(expression_statement
(dictionary
(pair (identifier) (integer))
(pair (identifier) (integer))))
(pair
(identifier)
(integer))
(pair
(identifier)
(integer))))
(expression_statement
(dictionary))
(expression_statement
(dictionary (dictionary_splat (dictionary))))
(dictionary
(dictionary_splat
(dictionary))))
(expression_statement
(dictionary (dictionary_splat (identifier))))
(dictionary
(dictionary_splat
(identifier))))
(expression_statement
(dictionary (dictionary_splat (attribute (identifier) (identifier)))))
(dictionary
(dictionary_splat
(attribute
(identifier)
(identifier)))))
(expression_statement
(dictionary (dictionary_splat (attribute (subscript (identifier) (identifier)) (identifier)))))
(dictionary
(dictionary_splat
(attribute
(subscript
(identifier)
(identifier))
(identifier)))))
(expression_statement
(dictionary (dictionary_splat (call (identifier) (argument_list))))))
(dictionary
(dictionary_splat
(call
(identifier)
(argument_list))))))
=====================================
================================================================================
Dictionary comprehensions
=====================================
================================================================================
{a: b for a, b in items}
{a: b for c in d for e in items}
---
--------------------------------------------------------------------------------
(module
(expression_statement
(dictionary_comprehension
(pair (identifier) (identifier))
(pair
(identifier)
(identifier))
(for_in_clause
(pattern_list (identifier) (identifier)) (identifier))))
(pattern_list
(identifier)
(identifier))
(identifier))))
(expression_statement
(dictionary_comprehension
(pair (identifier) (identifier))
(pair
(identifier)
(identifier))
(for_in_clause
(identifier) (identifier))
(identifier)
(identifier))
(for_in_clause
(identifier) (identifier)))))
(identifier)
(identifier)))))
=====================================
================================================================================
Sets
=====================================
================================================================================
{a, b, c,}
{*{}}
---
--------------------------------------------------------------------------------
(module
(expression_statement (set (identifier) (identifier) (identifier)))
(expression_statement (set (list_splat (dictionary)))))
(expression_statement
(set
(identifier)
(identifier)
(identifier)))
(expression_statement
(set
(list_splat
(dictionary)))))
=====================================
================================================================================
Set comprehensions
=====================================
================================================================================
{a[b][c] for a, b, c in items}
{r for s in qs for n in ms}
---
--------------------------------------------------------------------------------
(module
(expression_statement
(set_comprehension
(subscript (subscript (identifier) (identifier)) (identifier))
(subscript
(subscript
(identifier)
(identifier))
(identifier))
(for_in_clause
(pattern_list (identifier) (identifier) (identifier))
(pattern_list
(identifier)
(identifier)
(identifier))
(identifier))))
(expression_statement
(set_comprehension
@ -498,48 +690,70 @@ Set comprehensions
(identifier)
(identifier)))))
=====================================
================================================================================
Simple Tuples
=====================================
================================================================================
()
(a, b)
(a, b, c,)
(print, exec)
---
--------------------------------------------------------------------------------
(module
(expression_statement (tuple))
(expression_statement (tuple (identifier) (identifier)))
(expression_statement (tuple (identifier) (identifier) (identifier)))
(expression_statement (tuple (identifier) (identifier))))
(expression_statement
(tuple))
(expression_statement
(tuple
(identifier)
(identifier)))
(expression_statement
(tuple
(identifier)
(identifier)
(identifier)))
(expression_statement
(tuple
(identifier)
(identifier))))
=====================================
================================================================================
Generator expression
=====================================
================================================================================
(a[b][c] for a, b, c in items)
dict((a, b) for a, b in d)
(a for b in c for d in e,)
(x for x in range(1, 10))
---
--------------------------------------------------------------------------------
(module
(expression_statement
(generator_expression
(subscript (subscript (identifier) (identifier)) (identifier))
(subscript
(subscript
(identifier)
(identifier))
(identifier))
(for_in_clause
(pattern_list (identifier) (identifier) (identifier))
(pattern_list
(identifier)
(identifier)
(identifier))
(identifier))))
(expression_statement
(call
(identifier)
(generator_expression
(tuple (identifier) (identifier))
(tuple
(identifier)
(identifier))
(for_in_clause
(pattern_list (identifier) (identifier))
(pattern_list
(identifier)
(identifier))
(identifier)))))
(expression_statement
(generator_expression
@ -555,4 +769,8 @@ dict((a, b) for a, b in d)
(identifier)
(for_in_clause
(identifier)
(call (identifier) (argument_list (integer) (integer)))))))
(call
(identifier)
(argument_list
(integer)
(integer)))))))

568
vendor/tree-sitter-python/test/corpus/pattern_matching.txt vendored
Unescape Escape View File

@ -0,0 +1,568 @@
================================================================================
Matching specific values
================================================================================
match command.split():
case ["quit"]:
print("Goodbye!")
quit_game()
case ["look"]:
current_room.describe()
case ["get", obj]:
character.get(obj, current_room)
case ["go", direction]:
current_room = current_room.neighbor(direction)
# The rest of your commands go here
--------------------------------------------------------------------------------
(module
(match_statement
(call
(attribute
(identifier)
(identifier))
(argument_list))
(case_clause
(case_pattern
(list
(string)))
(block
(expression_statement
(call
(identifier)
(argument_list
(string))))
(expression_statement
(call
(identifier)
(argument_list)))))
(case_clause
(case_pattern
(list
(string)))
(block
(expression_statement
(call
(attribute
(identifier)
(identifier))
(argument_list)))))
(case_clause
(case_pattern
(list
(string)
(identifier)))
(block
(expression_statement
(call
(attribute
(identifier)
(identifier))
(argument_list
(identifier)
(identifier))))))
(case_clause
(case_pattern
(list
(string)
(identifier)))
(block
(expression_statement
(assignment
(identifier)
(call
(attribute
(identifier)
(identifier))
(argument_list
(identifier))))))))
(comment))
================================================================================
Matching multiple values
================================================================================
match command.split():
case ["drop", *objects]:
for obj in objects:
character.drop(obj, current_room)
--------------------------------------------------------------------------------
(module
(match_statement
(call
(attribute
(identifier)
(identifier))
(argument_list))
(case_clause
(case_pattern
(list
(string)
(list_splat
(identifier))))
(block
(for_statement
(identifier)
(identifier)
(block
(expression_statement
(call
(attribute
(identifier)
(identifier))
(argument_list
(identifier)
(identifier))))))))))
================================================================================
Adding a wild card
================================================================================
match command.split():
# ^ conditional
case ["quit"]: ... # Code omitted for brevity
case ["go", direction]: pass
case ["drop", *objects]: pass
case _:
print(f"Sorry, I couldn't understand {command!r}")
--------------------------------------------------------------------------------
(module
(match_statement
(call
(attribute
(identifier)
(identifier))
(argument_list))
(comment)
(case_clause
(case_pattern
(list
(string)))
(block
(expression_statement
(ellipsis))
(comment)))
(case_clause
(case_pattern
(list
(string)
(identifier)))
(block
(pass_statement)))
(case_clause
(case_pattern
(list
(string)
(list_splat
(identifier))))
(block
(pass_statement)))
(case_clause
(case_pattern
(identifier))
(block
(expression_statement
(call
(identifier)
(argument_list
(string
(interpolation
(identifier)
(type_conversion))))))))))
================================================================================
Or patterns
================================================================================
match command.split():
case ["north"] | ["go", "north"]:
current_room = current_room.neighbor("north")
case ["get", obj] | ["pick", "up", obj] | ["pick", obj, "up"]:
pass
--------------------------------------------------------------------------------
(module
(match_statement
(call
(attribute
(identifier)
(identifier))
(argument_list))
(case_clause
(case_pattern
(binary_operator
(list
(string))
(list
(string)
(string))))
(block
(expression_statement
(assignment
(identifier)
(call
(attribute
(identifier)
(identifier))
(argument_list
(string)))))))
(case_clause
(case_pattern
(binary_operator
(binary_operator
(list
(string)
(identifier))
(list
(string)
(string)
(identifier)))
(list
(string)
(identifier)
(string))))
(block
(pass_statement)))))
================================================================================
As patterns
================================================================================
match command.split():
case ["go", ("north" | "south" | "east" | "west") as direction]:
current_room = current_room.neighbor(direction)
--------------------------------------------------------------------------------
(module
(match_statement
(call
(attribute
(identifier)
(identifier))
(argument_list))
(case_clause
(case_pattern
(list
(string)
(as_pattern
(parenthesized_expression
(binary_operator
(binary_operator
(binary_operator
(string)
(string))
(string))
(string)))
(as_pattern_target
(identifier)))))
(block
(expression_statement
(assignment
(identifier)
(call
(attribute
(identifier)
(identifier))
(argument_list
(identifier)))))))))
================================================================================
Actually not match
================================================================================
match = 2
match, a = 2, 3
match: int = secret
x, match = 2, "hey, what's up?"
--------------------------------------------------------------------------------
(module
(expression_statement
(assignment
(identifier)
(integer)))
(expression_statement
(assignment
(pattern_list
(identifier)
(identifier))
(expression_list
(integer)
(integer))))
(expression_statement
(assignment
(identifier)
(type
(identifier))
(identifier)))
(expression_statement
(assignment
(pattern_list
(identifier)
(identifier))
(expression_list
(integer)
(string)))))
================================================================================
Match is match but not pattern matching
================================================================================
a = [match]
match = [match]
--------------------------------------------------------------------------------
(module
(expression_statement
(assignment
(identifier)
(list
(identifier))))
(expression_statement
(assignment
(identifier)
(list
(identifier)))))
================================================================================
Match kwargs
================================================================================
field = call(match=r".*\.txt$")
--------------------------------------------------------------------------------
(module
(expression_statement
(assignment
(identifier)
(call
(identifier)
(argument_list
(keyword_argument
(identifier)
(string)))))))
================================================================================
Match kwargs 2
================================================================================
field = match(match=match, match)
--------------------------------------------------------------------------------
(module
(expression_statement
(assignment
(identifier)
(call
(identifier)
(argument_list
(keyword_argument
(identifier)
(identifier))
(identifier))))))
================================================================================
Case used as identifier
================================================================================
a = [case]
case = [case]
just_in_case = call_me(case=True)
--------------------------------------------------------------------------------
(module
(expression_statement
(assignment
(identifier)
(list
(identifier))))
(expression_statement
(assignment
(identifier)
(list
(identifier))))
(expression_statement
(assignment
(identifier)
(call
(identifier)
(argument_list
(keyword_argument
(identifier)
(true)))))))
================================================================================
If guards
================================================================================
match 0:
case 0 if False:
x = False
case 0 if True:
x = True
--------------------------------------------------------------------------------
(module
(match_statement
(integer)
(case_clause
(case_pattern
(integer))
(if_clause
(false))
(block
(expression_statement
(assignment
(identifier)
(false)))))
(case_clause
(case_pattern
(integer))
(if_clause
(true))
(block
(expression_statement
(assignment
(identifier)
(true)))))))
================================================================================
Comma separated cases
================================================================================
match (0, 1, 2):
case 0,1:
x = 0
case 0, *x:
x = 0
--------------------------------------------------------------------------------
(module
(match_statement
(tuple
(integer)
(integer)
(integer))
(case_clause
(case_pattern
(integer))
(case_pattern
(integer))
(block
(expression_statement
(assignment
(identifier)
(integer)))))
(case_clause
(case_pattern
(integer))
(case_pattern
(identifier))
(block
(expression_statement
(assignment
(identifier)
(integer)))))))
================================================================================
case terminating in comma
================================================================================
match x,:
case *x,:
y = 0
--------------------------------------------------------------------------------
(module
(match_statement
(identifier)
(case_clause
(case_pattern
(identifier))
(block
(expression_statement
(assignment
(identifier)
(integer)))))))
================================================================================
Multiple match patterns
================================================================================
match ..., ...:
case a, b:
return locals()
--------------------------------------------------------------------------------
(module
(match_statement
(ellipsis)
(ellipsis)
(case_clause
(case_pattern
(identifier))
(case_pattern
(identifier))
(block
(return_statement
(call
(identifier)
(argument_list)))))))
================================================================================
Match match, case case
================================================================================
match = case = 0
match match:
case case:
x = 0
--------------------------------------------------------------------------------
(module
(expression_statement
(assignment
(identifier)
(assignment
(identifier)
(integer))))
(match_statement
(identifier)
(case_clause
(case_pattern
(identifier))
(block
(expression_statement
(assignment
(identifier)
(integer)))))))
================================================================================
Walrus match (Issue #150)
================================================================================
if match := re.fullmatch(r"(-)?(\d+:)?\d?\d:\d\d(\.\d*)?", time, flags=re.ASCII):
return 42
--------------------------------------------------------------------------------
(module
(if_statement
(named_expression
(identifier)
(call
(attribute
(identifier)
(identifier))
(argument_list
(string)
(identifier)
(keyword_argument
(identifier)
(attribute
(identifier)
(identifier))))))
(block
(return_statement
(integer)))))

906
vendor/tree-sitter-python/test/corpus/statements.txt vendored
View File

File diff suppressed because it is too large Load Diff

4
vendor/tree-sitter-python/test/highlight/parameters.py vendored
Unescape Escape View File

@ -0,0 +1,4 @@
def g(h, i, /, j, *, k=100, **kwarg):
# ^ operator
# ^ operator
pass

54
vendor/tree-sitter-python/test/highlight/pattern_matching.py vendored
Unescape Escape View File

@ -0,0 +1,54 @@
match command.split():
# ^ keyword
case ["quit"]:
# ^ keyword
print("Goodbye!")
quit_game()
case ["look"]:
# ^ keyword
current_room.describe()
case ["get", obj]:
# ^ keyword
character.get(obj, current_room)
case ["go", direction]:
# ^ keyword
current_room = current_room.neighbor(direction)
# The rest of your commands go here
match command.split():
# ^ keyword
case ["drop", *objects]:
# ^ keyword
for obj in objects:
character.drop(obj, current_room)
match command.split():
# ^ keyword
case ["quit"]: ... # Code omitted for brevity
case ["go", direction]: pass
case ["drop", *objects]: pass
case _:
print(f"Sorry, I couldn't understand {command!r}")
match command.split():
# ^ keyword
case ["north"] | ["go", "north"]:
# ^ keyword
current_room = current_room.neighbor("north")
case ["get", obj] | ["pick", "up", obj] | ["pick", obj, "up"]:
# ^ keyword
pass
match = 2
# ^ variable
match, a = 2, 3
# ^ variable
match: int = secret
# ^ variable
x, match: str = 2, "hey, what's up?"
# <- variable
# ^ variable
if match := re.fullmatch(r"(-)?(\d+:)?\d?\d:\d\d(\.\d*)?", time, flags=re.ASCII):
# ^ variable
return match