Skip to content

Commit 2c645de

Browse files
1st11st1
committed
Further normalize string scopes
1 parent 8afe08e commit 2c645de

22 files changed

+183
-183
lines changed

Diff for: ‎grammars/MagicPython.cson

+6-6
Original file line numberDiff line numberDiff line change
@@ -2583,7 +2583,7 @@ repository:
25832583
}
25842584
]
25852585
"string-raw-quoted-single-line":
2586-
name: "string.quoted.single.raw.python"
2586+
name: "string.quoted.raw.single.python"
25872587
begin: "\\b(([uU]R)|(R))(\\'|\")"
25882588
end: "(\\4)|((?<!\\\\)\\n)"
25892589
beginCaptures:
@@ -2604,7 +2604,7 @@ repository:
26042604
}
26052605
]
26062606
"string-bin-quoted-single-line":
2607-
name: "string.quoted.single.binary.python"
2607+
name: "string.quoted.binary.single.python"
26082608
begin: "(\\b[bB])(\\'|\")"
26092609
end: "(\\2)|((?<!\\\\)\\n)"
26102610
beginCaptures:
@@ -2623,7 +2623,7 @@ repository:
26232623
}
26242624
]
26252625
"string-raw-bin-quoted-single-line":
2626-
name: "string.quoted.single.raw.binary.python"
2626+
name: "string.quoted.raw.binary.single.python"
26272627
begin: "(\\b(?:R[bB]|[bB]R))(\\'|\")"
26282628
end: "(\\2)|((?<!\\\\)\\n)"
26292629
beginCaptures:
@@ -2663,7 +2663,7 @@ repository:
26632663
}
26642664
]
26652665
"string-raw-quoted-multi-line":
2666-
name: "string.quoted.multi.raw.python"
2666+
name: "string.quoted.raw.multi.python"
26672667
begin: "\\b(([uU]R)|(R))(\\'\\'\\'|\"\"\")"
26682668
end: "(\\4)"
26692669
beginCaptures:
@@ -2684,7 +2684,7 @@ repository:
26842684
}
26852685
]
26862686
"string-bin-quoted-multi-line":
2687-
name: "string.quoted.multi.binary.python"
2687+
name: "string.quoted.binary.multi.python"
26882688
begin: "(\\b[bB])(\\'\\'\\'|\"\"\")"
26892689
end: "(\\2)"
26902690
beginCaptures:
@@ -2703,7 +2703,7 @@ repository:
27032703
}
27042704
]
27052705
"string-raw-bin-quoted-multi-line":
2706-
name: "string.quoted.multi.raw.binary.python"
2706+
name: "string.quoted.raw.binary.multi.python"
27072707
begin: "(\\b(?:R[bB]|[bB]R))(\\'\\'\\'|\"\"\")"
27082708
end: "(\\2)"
27092709
beginCaptures:

Diff for: ‎grammars/MagicPython.tmLanguage

+6-6
Original file line numberDiff line numberDiff line change
@@ -4398,7 +4398,7 @@ indirectly through syntactic constructs
43984398
<key>string-raw-quoted-single-line</key>
43994399
<dict>
44004400
<key>name</key>
4401-
<string>string.quoted.single.raw.python</string>
4401+
<string>string.quoted.raw.single.python</string>
44024402
<key>begin</key>
44034403
<string>\b(([uU]R)|(R))(\&apos;|&quot;)</string>
44044404
<key>end</key>
@@ -4445,7 +4445,7 @@ indirectly through syntactic constructs
44454445
<key>string-bin-quoted-single-line</key>
44464446
<dict>
44474447
<key>name</key>
4448-
<string>string.quoted.single.binary.python</string>
4448+
<string>string.quoted.binary.single.python</string>
44494449
<key>begin</key>
44504450
<string>(\b[bB])(\&apos;|&quot;)</string>
44514451
<key>end</key>
@@ -4487,7 +4487,7 @@ indirectly through syntactic constructs
44874487
<key>string-raw-bin-quoted-single-line</key>
44884488
<dict>
44894489
<key>name</key>
4490-
<string>string.quoted.single.raw.binary.python</string>
4490+
<string>string.quoted.raw.binary.single.python</string>
44914491
<key>begin</key>
44924492
<string>(\b(?:R[bB]|[bB]R))(\&apos;|&quot;)</string>
44934493
<key>end</key>
@@ -4576,7 +4576,7 @@ indirectly through syntactic constructs
45764576
<key>string-raw-quoted-multi-line</key>
45774577
<dict>
45784578
<key>name</key>
4579-
<string>string.quoted.multi.raw.python</string>
4579+
<string>string.quoted.raw.multi.python</string>
45804580
<key>begin</key>
45814581
<string>\b(([uU]R)|(R))(\&apos;\&apos;\&apos;|&quot;&quot;&quot;)</string>
45824582
<key>end</key>
@@ -4623,7 +4623,7 @@ indirectly through syntactic constructs
46234623
<key>string-bin-quoted-multi-line</key>
46244624
<dict>
46254625
<key>name</key>
4626-
<string>string.quoted.multi.binary.python</string>
4626+
<string>string.quoted.binary.multi.python</string>
46274627
<key>begin</key>
46284628
<string>(\b[bB])(\&apos;\&apos;\&apos;|&quot;&quot;&quot;)</string>
46294629
<key>end</key>
@@ -4665,7 +4665,7 @@ indirectly through syntactic constructs
46654665
<key>string-raw-bin-quoted-multi-line</key>
46664666
<dict>
46674667
<key>name</key>
4668-
<string>string.quoted.multi.raw.binary.python</string>
4668+
<string>string.quoted.raw.binary.multi.python</string>
46694669
<key>begin</key>
46704670
<string>(\b(?:R[bB]|[bB]R))(\&apos;\&apos;\&apos;|&quot;&quot;&quot;)</string>
46714671
<key>end</key>

Diff for: ‎grammars/pystring.inc.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repository:
33
string-raw-quoted-${line}-line:
4-
name: string.quoted.${line}.raw.python
4+
name: string.quoted.raw.${line}.python
55
begin: \b(([uU]R)|(R))(${marker})
66
end: (\4)${guard}
77
beginCaptures:
@@ -15,7 +15,7 @@ repository:
1515
- include: '#string-raw-guts'
1616

1717
string-bin-quoted-${line}-line:
18-
name: string.quoted.${line}.binary.python
18+
name: string.quoted.binary.${line}.python
1919
begin: (\b[bB])(${marker})
2020
end: (\2)${guard}
2121
beginCaptures:
@@ -28,7 +28,7 @@ repository:
2828
- include: '#string-entity'
2929

3030
string-raw-bin-quoted-${line}-line:
31-
name: string.quoted.${line}.raw.binary.python
31+
name: string.quoted.raw.binary.${line}.python
3232
begin: (\b(?:R[bB]|[bB]R))(${marker})
3333
end: (\2)${guard}
3434
beginCaptures:

Diff for: ‎test/docstrings/class1.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ class : meta.class.python, source.python, storage.type.class.python
7575
Foo : entity.name.type.class.python, meta.class.python, source.python
7676
: : meta.class.python, punctuation.section.class.begin.python, source.python
7777
: source.python
78-
b : source.python, storage.type.string.python, string.quoted.multi.binary.python
79-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
80-
TEST : source.python, string.quoted.multi.binary.python
81-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
78+
b : source.python, storage.type.string.python, string.quoted.binary.multi.python
79+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
80+
TEST : source.python, string.quoted.binary.multi.python
81+
''' : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python
8282
: source.python
8383
class : meta.class.python, source.python, storage.type.class.python
8484
: meta.class.python, source.python
8585
Foo : entity.name.type.class.python, meta.class.python, source.python
8686
: : meta.class.python, punctuation.section.class.begin.python, source.python
8787
: source.python
88-
B : source.python, storage.type.string.python, string.quoted.multi.binary.python
89-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
90-
TEST : source.python, string.quoted.multi.binary.python
91-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
88+
B : source.python, storage.type.string.python, string.quoted.binary.multi.python
89+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
90+
TEST : source.python, string.quoted.binary.multi.python
91+
''' : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python

Diff for: ‎test/docstrings/class2.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ class : meta.class.python, source.python, storage.type.class.python
7676
Foo : entity.name.type.class.python, meta.class.python, source.python
7777
: : meta.class.python, punctuation.section.class.begin.python, source.python
7878
: source.python
79-
b : source.python, storage.type.string.python, string.quoted.multi.binary.python
80-
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
81-
TEST : source.python, string.quoted.multi.binary.python
82-
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
79+
b : source.python, storage.type.string.python, string.quoted.binary.multi.python
80+
""" : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
81+
TEST : source.python, string.quoted.binary.multi.python
82+
""" : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python
8383
: source.python
8484
class : meta.class.python, source.python, storage.type.class.python
8585
: meta.class.python, source.python
8686
Foo : entity.name.type.class.python, meta.class.python, source.python
8787
: : meta.class.python, punctuation.section.class.begin.python, source.python
8888
: source.python
89-
B : source.python, storage.type.string.python, string.quoted.multi.binary.python
90-
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
91-
TEST : source.python, string.quoted.multi.binary.python
92-
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
89+
B : source.python, storage.type.string.python, string.quoted.binary.multi.python
90+
""" : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
91+
TEST : source.python, string.quoted.binary.multi.python
92+
""" : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python

Diff for: ‎test/docstrings/def1.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ def : meta.function.python, source.python, storage.type.function.pytho
9393
) : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
9494
: : meta.function.python, punctuation.section.function.begin.python, source.python
9595
: source.python
96-
b : source.python, storage.type.string.python, string.quoted.multi.binary.python
97-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
98-
TEST : source.python, string.quoted.multi.binary.python
99-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
96+
b : source.python, storage.type.string.python, string.quoted.binary.multi.python
97+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
98+
TEST : source.python, string.quoted.binary.multi.python
99+
''' : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python
100100
: source.python
101101
def : meta.function.python, source.python, storage.type.function.python
102102
: meta.function.python, source.python
@@ -105,7 +105,7 @@ def : meta.function.python, source.python, storage.type.function.pytho
105105
) : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
106106
: : meta.function.python, punctuation.section.function.begin.python, source.python
107107
: source.python
108-
B : source.python, storage.type.string.python, string.quoted.multi.binary.python
109-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
110-
TEST : source.python, string.quoted.multi.binary.python
111-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
108+
B : source.python, storage.type.string.python, string.quoted.binary.multi.python
109+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
110+
TEST : source.python, string.quoted.binary.multi.python
111+
''' : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python

Diff for: ‎test/docstrings/def2.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ def : meta.function.python, source.python, storage.type.function.pytho
9393
) : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
9494
: : meta.function.python, punctuation.section.function.begin.python, source.python
9595
: source.python
96-
b : source.python, storage.type.string.python, string.quoted.multi.binary.python
97-
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
98-
TEST : source.python, string.quoted.multi.binary.python
99-
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
96+
b : source.python, storage.type.string.python, string.quoted.binary.multi.python
97+
""" : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
98+
TEST : source.python, string.quoted.binary.multi.python
99+
""" : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python
100100
: source.python
101101
def : meta.function.python, source.python, storage.type.function.python
102102
: meta.function.python, source.python
@@ -105,7 +105,7 @@ def : meta.function.python, source.python, storage.type.function.pytho
105105
) : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
106106
: : meta.function.python, punctuation.section.function.begin.python, source.python
107107
: source.python
108-
B : source.python, storage.type.string.python, string.quoted.multi.binary.python
109-
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
110-
TEST : source.python, string.quoted.multi.binary.python
111-
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
108+
B : source.python, storage.type.string.python, string.quoted.binary.multi.python
109+
""" : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
110+
TEST : source.python, string.quoted.binary.multi.python
111+
""" : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python

Diff for: ‎test/docstrings/module1.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.python
3030
TEST : source.python, string.quoted.multi.python
3131
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.python
32-
b : source.python, storage.type.string.python, string.quoted.multi.binary.python
33-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
34-
TEST : source.python, string.quoted.multi.binary.python
35-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
36-
B : source.python, storage.type.string.python, string.quoted.multi.binary.python
37-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
38-
TEST : source.python, string.quoted.multi.binary.python
39-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
32+
b : source.python, storage.type.string.python, string.quoted.binary.multi.python
33+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
34+
TEST : source.python, string.quoted.binary.multi.python
35+
''' : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python
36+
B : source.python, storage.type.string.python, string.quoted.binary.multi.python
37+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
38+
TEST : source.python, string.quoted.binary.multi.python
39+
''' : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python

Diff for: ‎test/docstrings/module2.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.python
3131
TEST : source.python, string.quoted.multi.python
3232
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.python
33-
b : source.python, storage.type.string.python, string.quoted.multi.binary.python
34-
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
35-
TEST : source.python, string.quoted.multi.binary.python
36-
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
37-
B : source.python, storage.type.string.python, string.quoted.multi.binary.python
38-
""" : punctuation.definition.string.begin.python, source.python, string.quoted.multi.binary.python
39-
TEST : source.python, string.quoted.multi.binary.python
40-
""" : punctuation.definition.string.end.python, source.python, string.quoted.multi.binary.python
33+
b : source.python, storage.type.string.python, string.quoted.binary.multi.python
34+
""" : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
35+
TEST : source.python, string.quoted.binary.multi.python
36+
""" : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python
37+
B : source.python, storage.type.string.python, string.quoted.binary.multi.python
38+
""" : punctuation.definition.string.begin.python, source.python, string.quoted.binary.multi.python
39+
TEST : source.python, string.quoted.binary.multi.python
40+
""" : punctuation.definition.string.end.python, source.python, string.quoted.binary.multi.python

Diff for: ‎test/regexp/python1.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
a : source.python
1818
= : keyword.operator.assignment.python, source.python
1919
: source.python
20-
R : source.python, storage.type.string.python, string.quoted.single.raw.python
21-
' : punctuation.definition.string.begin.python, source.python, string.quoted.single.raw.python
22-
[a-z] : source.python, string.quoted.single.raw.python
23-
' : punctuation.definition.string.end.python, source.python, string.quoted.single.raw.python
20+
R : source.python, storage.type.string.python, string.quoted.raw.single.python
21+
' : punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
22+
[a-z] : source.python, string.quoted.raw.single.python
23+
' : punctuation.definition.string.end.python, source.python, string.quoted.raw.single.python

Diff for: ‎test/regexp/python5.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
a : source.python
3535
= : keyword.operator.assignment.python, source.python
3636
: source.python
37-
R : source.python, storage.type.string.python, string.quoted.multi.raw.python
38-
''' : punctuation.definition.string.begin.python, source.python, string.quoted.multi.raw.python
39-
(?x) # not a : source.python, string.quoted.multi.raw.python
40-
foo # comment : source.python, string.quoted.multi.raw.python
41-
''' : punctuation.definition.string.end.python, source.python, string.quoted.multi.raw.python
37+
R : source.python, storage.type.string.python, string.quoted.raw.multi.python
38+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.raw.multi.python
39+
(?x) # not a : source.python, string.quoted.raw.multi.python
40+
foo # comment : source.python, string.quoted.raw.multi.python
41+
''' : punctuation.definition.string.end.python, source.python, string.quoted.raw.multi.python

0 commit comments

Comments
 (0)