Skip to content

Commit b6ee01b

Browse files
Merge remote-tracking branch 'github/master'
2 parents a42411d + 55a9b8a commit b6ee01b

File tree

9 files changed

+57190
-58946
lines changed

9 files changed

+57190
-58946
lines changed

.github/workflows/ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@ jobs:
4949
with:
5050
files: |
5151
examples/**/*.py
52+
!examples/cpython/Lib/test/test_annotationlib.py
53+
!examples/cpython/Lib/test/test_type_params.py
5254
!examples/cpython/Lib/test/test_compile.py
5355
!examples/cpython/Tools/build/generate_re_casefix.py
56+
!examples/cpython/Lib/test/test_annotationlib.py
57+
!examples/cpython/Lib/test/test_type_params.py
5458
invalid-files: |
5559
examples/cpython/Lib/test/tokenizedata/badsyntax_3131.py
5660
fuzz:

bindings/go/binding_test.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/go/go.mod go.mod

File renamed without changes.

grammar.js

+11-4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ module.exports = grammar({
5656
[$.named_expression, $.as_pattern],
5757
[$.print_statement, $.primary_expression],
5858
[$.type_alias_statement, $.primary_expression],
59+
[$.match_statement, $.primary_expression],
5960
],
6061

6162
supertypes: $ => [
@@ -806,6 +807,10 @@ module.exports = grammar({
806807
field('argument', $.primary_expression),
807808
)),
808809

810+
_not_in: _ => seq('not', 'in'),
811+
812+
_is_not: _ => seq('is', 'not'),
813+
809814
comparison_operator: $ => prec.left(PREC.compare, seq(
810815
$.primary_expression,
811816
repeat1(seq(
@@ -819,9 +824,9 @@ module.exports = grammar({
819824
'>',
820825
'<>',
821826
'in',
822-
alias(seq('not', 'in'), 'not in'),
827+
alias($._not_in, 'not in'),
823828
'is',
824-
alias(seq('is', 'not'), 'is not'),
829+
alias($._is_not, 'is not'),
825830
)),
826831
$.primary_expression,
827832
)),
@@ -1171,11 +1176,13 @@ module.exports = grammar({
11711176
'exec',
11721177
'async',
11731178
'await',
1174-
'match',
11751179
),
11761180
$.identifier,
11771181
)),
1178-
alias('type', $.identifier),
1182+
alias(
1183+
choice('type', 'match'),
1184+
$.identifier,
1185+
),
11791186
),
11801187

11811188
true: _ => 'True',

queries/highlights.scm

+2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
"is"
9797
"not"
9898
"or"
99+
"is not"
100+
"not in"
99101
] @operator
100102

101103
[

src/grammar.json

+45-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node-types.json

+10-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)