Skip to content

Commit 976e59d

Browse files
vpetrovykhvpetrovykh
committed
Drop support.other.format.python scope name.
We use this awkward scope name instead of perhaps more elegant "support.other.format.python" because it appears that by default it gives a better visual result in various systems (e.g. GitHub). This is due to the fact that "storage.type..." is more likely to have special highlighting in any given color scheme than "support.other..."
1 parent 6a2dba3 commit 976e59d

17 files changed

+114
-99
lines changed

‎grammars/MagicPython.cson

+22-22
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ repository:
950950
"2":
951951
name: "storage.type.format.python"
952952
"3":
953-
name: "support.other.format.python"
953+
name: "storage.type.format.python"
954954
}
955955
{
956956
name: "constant.character.format.placeholder.other.python"
@@ -968,7 +968,7 @@ repository:
968968
"2":
969969
name: "storage.type.format.python"
970970
"3":
971-
name: "support.other.format.python"
971+
name: "storage.type.format.python"
972972
patterns: [
973973
{
974974
match: '''
@@ -4620,7 +4620,7 @@ repository:
46204620
"1":
46214621
name: "storage.type.format.python"
46224622
"2":
4623-
name: "support.other.format.python"
4623+
name: "storage.type.format.python"
46244624
}
46254625
{
46264626
include: "#fstring-terminator-single-tail"
@@ -4633,7 +4633,7 @@ repository:
46334633
"1":
46344634
name: "storage.type.format.python"
46354635
"2":
4636-
name: "support.other.format.python"
4636+
name: "storage.type.format.python"
46374637
patterns: [
46384638
{
46394639
include: "#fstring-illegal-single-brace"
@@ -4642,35 +4642,35 @@ repository:
46424642
include: "#fstring-single-brace"
46434643
}
46444644
{
4645-
name: "support.other.format.python"
4645+
name: "storage.type.format.python"
46464646
match: "([bcdeEfFgGnosxX%])(?=})"
46474647
}
46484648
{
4649-
name: "support.other.format.python"
4649+
name: "storage.type.format.python"
46504650
match: "(\\.\\d+)"
46514651
}
46524652
{
4653-
name: "support.other.format.python"
4653+
name: "storage.type.format.python"
46544654
match: "(,)"
46554655
}
46564656
{
4657-
name: "support.other.format.python"
4657+
name: "storage.type.format.python"
46584658
match: "(\\d+)"
46594659
}
46604660
{
4661-
name: "support.other.format.python"
4661+
name: "storage.type.format.python"
46624662
match: "(\\#)"
46634663
}
46644664
{
4665-
name: "support.other.format.python"
4665+
name: "storage.type.format.python"
46664666
match: "([-+ ])"
46674667
}
46684668
{
4669-
name: "support.other.format.python"
4669+
name: "storage.type.format.python"
46704670
match: "([<>=^])"
46714671
}
46724672
{
4673-
name: "support.other.format.python"
4673+
name: "storage.type.format.python"
46744674
match: "(\\w)"
46754675
}
46764676
]
@@ -4844,7 +4844,7 @@ repository:
48444844
"1":
48454845
name: "storage.type.format.python"
48464846
"2":
4847-
name: "support.other.format.python"
4847+
name: "storage.type.format.python"
48484848
}
48494849
{
48504850
include: "#fstring-terminator-multi-tail"
@@ -4857,7 +4857,7 @@ repository:
48574857
"1":
48584858
name: "storage.type.format.python"
48594859
"2":
4860-
name: "support.other.format.python"
4860+
name: "storage.type.format.python"
48614861
patterns: [
48624862
{
48634863
include: "#fstring-illegal-multi-brace"
@@ -4866,35 +4866,35 @@ repository:
48664866
include: "#fstring-multi-brace"
48674867
}
48684868
{
4869-
name: "support.other.format.python"
4869+
name: "storage.type.format.python"
48704870
match: "([bcdeEfFgGnosxX%])(?=})"
48714871
}
48724872
{
4873-
name: "support.other.format.python"
4873+
name: "storage.type.format.python"
48744874
match: "(\\.\\d+)"
48754875
}
48764876
{
4877-
name: "support.other.format.python"
4877+
name: "storage.type.format.python"
48784878
match: "(,)"
48794879
}
48804880
{
4881-
name: "support.other.format.python"
4881+
name: "storage.type.format.python"
48824882
match: "(\\d+)"
48834883
}
48844884
{
4885-
name: "support.other.format.python"
4885+
name: "storage.type.format.python"
48864886
match: "(\\#)"
48874887
}
48884888
{
4889-
name: "support.other.format.python"
4889+
name: "storage.type.format.python"
48904890
match: "([-+ ])"
48914891
}
48924892
{
4893-
name: "support.other.format.python"
4893+
name: "storage.type.format.python"
48944894
match: "([<>=^])"
48954895
}
48964896
{
4897-
name: "support.other.format.python"
4897+
name: "storage.type.format.python"
48984898
match: "(\\w)"
48994899
}
49004900
]

‎grammars/MagicPython.tmLanguage

+22-22
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@
14541454
<key>3</key>
14551455
<dict>
14561456
<key>name</key>
1457-
<string>support.other.format.python</string>
1457+
<string>storage.type.format.python</string>
14581458
</dict>
14591459
</dict>
14601460
</dict>
@@ -1481,7 +1481,7 @@
14811481
<key>3</key>
14821482
<dict>
14831483
<key>name</key>
1484-
<string>support.other.format.python</string>
1484+
<string>storage.type.format.python</string>
14851485
</dict>
14861486
</dict>
14871487
<key>patterns</key>
@@ -8083,7 +8083,7 @@ indirectly through syntactic constructs
80838083
<key>2</key>
80848084
<dict>
80858085
<key>name</key>
8086-
<string>support.other.format.python</string>
8086+
<string>storage.type.format.python</string>
80878087
</dict>
80888088
</dict>
80898089
</dict>
@@ -8109,7 +8109,7 @@ indirectly through syntactic constructs
81098109
<key>2</key>
81108110
<dict>
81118111
<key>name</key>
8112-
<string>support.other.format.python</string>
8112+
<string>storage.type.format.python</string>
81138113
</dict>
81148114
</dict>
81158115
<key>patterns</key>
@@ -8124,49 +8124,49 @@ indirectly through syntactic constructs
81248124
</dict>
81258125
<dict>
81268126
<key>name</key>
8127-
<string>support.other.format.python</string>
8127+
<string>storage.type.format.python</string>
81288128
<key>match</key>
81298129
<string>([bcdeEfFgGnosxX%])(?=})</string>
81308130
</dict>
81318131
<dict>
81328132
<key>name</key>
8133-
<string>support.other.format.python</string>
8133+
<string>storage.type.format.python</string>
81348134
<key>match</key>
81358135
<string>(\.\d+)</string>
81368136
</dict>
81378137
<dict>
81388138
<key>name</key>
8139-
<string>support.other.format.python</string>
8139+
<string>storage.type.format.python</string>
81408140
<key>match</key>
81418141
<string>(,)</string>
81428142
</dict>
81438143
<dict>
81448144
<key>name</key>
8145-
<string>support.other.format.python</string>
8145+
<string>storage.type.format.python</string>
81468146
<key>match</key>
81478147
<string>(\d+)</string>
81488148
</dict>
81498149
<dict>
81508150
<key>name</key>
8151-
<string>support.other.format.python</string>
8151+
<string>storage.type.format.python</string>
81528152
<key>match</key>
81538153
<string>(\#)</string>
81548154
</dict>
81558155
<dict>
81568156
<key>name</key>
8157-
<string>support.other.format.python</string>
8157+
<string>storage.type.format.python</string>
81588158
<key>match</key>
81598159
<string>([-+ ])</string>
81608160
</dict>
81618161
<dict>
81628162
<key>name</key>
8163-
<string>support.other.format.python</string>
8163+
<string>storage.type.format.python</string>
81648164
<key>match</key>
81658165
<string>([&lt;&gt;=^])</string>
81668166
</dict>
81678167
<dict>
81688168
<key>name</key>
8169-
<string>support.other.format.python</string>
8169+
<string>storage.type.format.python</string>
81708170
<key>match</key>
81718171
<string>(\w)</string>
81728172
</dict>
@@ -8455,7 +8455,7 @@ indirectly through syntactic constructs
84558455
<key>2</key>
84568456
<dict>
84578457
<key>name</key>
8458-
<string>support.other.format.python</string>
8458+
<string>storage.type.format.python</string>
84598459
</dict>
84608460
</dict>
84618461
</dict>
@@ -8481,7 +8481,7 @@ indirectly through syntactic constructs
84818481
<key>2</key>
84828482
<dict>
84838483
<key>name</key>
8484-
<string>support.other.format.python</string>
8484+
<string>storage.type.format.python</string>
84858485
</dict>
84868486
</dict>
84878487
<key>patterns</key>
@@ -8496,49 +8496,49 @@ indirectly through syntactic constructs
84968496
</dict>
84978497
<dict>
84988498
<key>name</key>
8499-
<string>support.other.format.python</string>
8499+
<string>storage.type.format.python</string>
85008500
<key>match</key>
85018501
<string>([bcdeEfFgGnosxX%])(?=})</string>
85028502
</dict>
85038503
<dict>
85048504
<key>name</key>
8505-
<string>support.other.format.python</string>
8505+
<string>storage.type.format.python</string>
85068506
<key>match</key>
85078507
<string>(\.\d+)</string>
85088508
</dict>
85098509
<dict>
85108510
<key>name</key>
8511-
<string>support.other.format.python</string>
8511+
<string>storage.type.format.python</string>
85128512
<key>match</key>
85138513
<string>(,)</string>
85148514
</dict>
85158515
<dict>
85168516
<key>name</key>
8517-
<string>support.other.format.python</string>
8517+
<string>storage.type.format.python</string>
85188518
<key>match</key>
85198519
<string>(\d+)</string>
85208520
</dict>
85218521
<dict>
85228522
<key>name</key>
8523-
<string>support.other.format.python</string>
8523+
<string>storage.type.format.python</string>
85248524
<key>match</key>
85258525
<string>(\#)</string>
85268526
</dict>
85278527
<dict>
85288528
<key>name</key>
8529-
<string>support.other.format.python</string>
8529+
<string>storage.type.format.python</string>
85308530
<key>match</key>
85318531
<string>([-+ ])</string>
85328532
</dict>
85338533
<dict>
85348534
<key>name</key>
8535-
<string>support.other.format.python</string>
8535+
<string>storage.type.format.python</string>
85368536
<key>match</key>
85378537
<string>([&lt;&gt;=^])</string>
85388538
</dict>
85398539
<dict>
85408540
<key>name</key>
8541-
<string>support.other.format.python</string>
8541+
<string>storage.type.format.python</string>
85428542
<key>match</key>
85438543
<string>(\w)</string>
85448544
</dict>

‎grammars/src/MagicPython.syntax.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,16 @@ repository:
793793
})
794794
)
795795
captures:
796+
# We use this awkward scope name instead of perhaps more
797+
# elegant "support.other.format.python" because it appears
798+
# that by default it gives a better visual result in various
799+
# systems (e.g. GitHub). This is due to the fact that
800+
# "storage.type..." is more likely to have special
801+
# highlighting in any given color scheme than
802+
# "support.other..."
803+
#
796804
'2': {name: storage.type.format.python}
797-
'3': {name: support.other.format.python}
805+
'3': {name: storage.type.format.python}
798806
- name: constant.character.format.placeholder.other.python
799807
begin: |
800808
(?x)
@@ -806,7 +814,7 @@ repository:
806814
end: \}
807815
beginCaptures:
808816
'2': {name: storage.type.format.python}
809-
'3': {name: support.other.format.python}
817+
'3': {name: storage.type.format.python}
810818
patterns:
811819
- match: |
812820
(?x) \{ [^'"}\n]*? \} (?=.*?\})

‎grammars/src/pyfstring.inc.syntax.yaml

+18-10
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,16 @@ repository:
135135
( : \w? [<>=^]? [-+ ]? \#?
136136
\d* ,? (\.\d+)? [bcdeEfFgGnosxX%]? )(?=})
137137
captures:
138+
# We use this awkward scope name instead of perhaps more
139+
# elegant "support.other.format.python" because it appears
140+
# that by default it gives a better visual result in various
141+
# systems (e.g. GitHub). This is due to the fact that
142+
# "storage.type..." is more likely to have special
143+
# highlighting in any given color scheme than
144+
# "support.other..."
145+
#
138146
'1': {name: storage.type.format.python}
139-
'2': {name: support.other.format.python}
147+
'2': {name: storage.type.format.python}
140148
141149
- include: '#fstring-terminator-${line}-tail'
142150

@@ -145,25 +153,25 @@ repository:
145153
end: (?=})${fguard}
146154
beginCaptures:
147155
'1': {name: storage.type.format.python}
148-
'2': {name: support.other.format.python}
156+
'2': {name: storage.type.format.python}
149157

150158
patterns:
151159
- include: '#fstring-illegal-${line}-brace'
152160
- include: '#fstring-${line}-brace'
153-
- name: support.other.format.python
161+
- name: storage.type.format.python
154162
match: ([bcdeEfFgGnosxX%])(?=})
155-
- name: support.other.format.python
163+
- name: storage.type.format.python
156164
match: (\.\d+)
157-
- name: support.other.format.python
165+
- name: storage.type.format.python
158166
match: (,)
159-
- name: support.other.format.python
167+
- name: storage.type.format.python
160168
match: (\d+)
161-
- name: support.other.format.python
169+
- name: storage.type.format.python
162170
match: (\#)
163-
- name: support.other.format.python
171+
- name: storage.type.format.python
164172
match: ([-+ ])
165-
- name: support.other.format.python
173+
- name: storage.type.format.python
166174
match: ([<>=^])
167-
- name: support.other.format.python
175+
- name: storage.type.format.python
168176
match: (\w)
169177
...

‎misc/scopes

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ string.regexp.quoted.single.python
149149
support.function.builtin.python
150150
support.function.magic.python
151151
support.other.escape.special.regexp
152-
support.other.format.python
153152
support.other.match.any.regexp
154153
support.other.match.begin.regexp
155154
support.other.match.end.regexp

0 commit comments

Comments
 (0)