Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Python] Rename mapping separator scopes #3271

Merged
merged 1 commit into from
Mar 14, 2022
Merged

[Python] Rename mapping separator scopes #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Python/Python.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,12 +601,12 @@ contexts:
scope: punctuation.section.mapping.end.python
pop: true
- match: ','
scope: punctuation.separator.mapping.pair.python
scope: punctuation.separator.sequence.python
- match: \*\*
scope: keyword.operator.unpacking.mapping.python
push: case-pattern-dictionary-patterns
- match: ':'
scope: meta.mapping.python punctuation.separator.mapping.key-value.python
scope: meta.mapping.python punctuation.separator.key-value.python
push:
- case-pattern-dictionary-value
- allow-unpack-operators
Expand Down Expand Up @@ -1528,7 +1528,7 @@ contexts:
set: after-expression
- include: illegal-assignment-expression
- match: ':'
scope: punctuation.separator.mapping.key-value.python
scope: punctuation.separator.key-value.python
set: inside-directory-value
- match: ','
scope: invalid.illegal.expected-colon.python
Expand All @@ -1538,7 +1538,7 @@ contexts:
- match: (?=\})
pop: true
- match: ','
scope: punctuation.separator.mapping.python
scope: punctuation.separator.sequence.python
pop: true
- include: expression-in-a-group
- include: comments
Expand All @@ -1559,7 +1559,7 @@ contexts:
set:
# clear meta scope from this match, because 'inside-directory' has it in meta_scope
- match: ','
scope: punctuation.separator.mapping.python
scope: punctuation.separator.sequence.python
set: inside-dictionary
- match: (?=(?:async|for)\b)
push:
Expand Down
30 changes: 15 additions & 15 deletions Python/syntax_test_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ def _():

{foo.: bar.baz.}.
# ^ punctuation.accessor.dot.python
# ^ punctuation.separator.mapping.key-value.python
# ^ punctuation.separator.key-value.python
# ^ punctuation.accessor.dot.python
# ^ punctuation.accessor.dot.python
# ^ punctuation.accessor.dot.python
Expand Down Expand Up @@ -1116,13 +1116,13 @@ def _():
# ^^^^ keyword.control.conditional.case.python
# ^ punctuation.section.mapping.begin.python
# ^^^^^ meta.qualified-name.python meta.generic-name.python
# ^ punctuation.separator.mapping.key-value.python
# ^ punctuation.separator.key-value.python
# ^^^^^^^ string.quoted.single.python
# ^ punctuation.separator.mapping.pair.python
# ^ punctuation.separator.sequence.python
# ^^^^^^^ meta.qualified-name.python
# ^ punctuation.separator.mapping.key-value.python
# ^ punctuation.separator.key-value.python
# ^^^ constant.numeric.value.python
# ^ punctuation.separator.mapping.pair.python
# ^ punctuation.separator.sequence.python
# ^^ keyword.operator.unpacking.mapping.python
# ^^^^^^^ meta.generic-name.python
# ^ punctuation.section.mapping.end.python
Expand Down Expand Up @@ -1804,25 +1804,25 @@ def __call__(self, *args, **kwds):
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping - meta.mapping meta.mapping
# ^ punctuation.section.mapping.begin
# ^^^^^ meta.mapping.key.python string.quoted.double
# ^ punctuation.separator.mapping.key-value
# ^ punctuation.separator.key-value
# ^^^^ meta.mapping.value.python constant.language
# ^ punctuation.separator.mapping
# ^ punctuation.separator.sequence.python
# ^^^^ meta.mapping.key.python meta.qualified-name
# ^ punctuation.separator.mapping
# ^ punctuation.separator.key-value.python
# ^^^^^^^^^^^^^^^^ meta.sequence.tuple
# ^ punctuation.section.sequence.begin
# ^ constant.numeric
# ^ constant.numeric
# ^^^^^^^^ meta.sequence.list
# ^ punctuation.separator.sequence
# ^ punctuation.section.sequence.end
# ^ punctuation.separator.mapping.python
# ^ punctuation.separator.sequence.python
# ^ invalid.illegal.expected-colon.python
# ^ punctuation.section.mapping.end - meta.mapping.key

mydict = { 'a' : xform, 'b' : form, 'c' : frm }
# ^ meta.mapping.python punctuation.separator.mapping.python
# ^ punctuation.separator.mapping.key-value.python
# ^ meta.mapping.python punctuation.separator.sequence.python
# ^ punctuation.separator.key-value.python

mydict = { a : b async for b in range(1, 2) }
# ^^^^^ storage.modifier.async.python
Expand All @@ -1846,7 +1846,7 @@ def __call__(self, *args, **kwds):
# ^ meta.mapping.python punctuation.section.mapping.begin.python
1: True
# ^ meta.mapping.key.python meta.number.integer.decimal.python constant.numeric.value.python
# ^ punctuation.separator.mapping.key-value.python
# ^ punctuation.separator.key-value.python
}
# <- meta.mapping.python punctuation.section.mapping.end.python

Expand All @@ -1855,8 +1855,8 @@ def __call__(self, *args, **kwds):

more_complex_mapping = {**{1: 1}, 2: 2}
# ^ meta.mapping.python
# ^ meta.mapping.python punctuation.separator.mapping.python
# ^ meta.mapping.python punctuation.separator.mapping.key-value.python
# ^ meta.mapping.python punctuation.separator.sequence.python
# ^ meta.mapping.python punctuation.separator.key-value.python

more_complex_set = {
# ^ meta.set.python
Expand Down Expand Up @@ -2044,7 +2044,7 @@ def __call__(self, *args, **kwds):
# ^^^ - meta.mapping.key
# ^^ keyword.operator.unpacking.mapping.python
# ^ meta.qualified-name.python
# ^ punctuation.separator.mapping.python
# ^ punctuation.separator.sequence.python
# ^^^^^^^^ - meta.mapping.key
# ^^ keyword.operator.unpacking.mapping.python
# ^^^^ support.type.python
Expand Down