Skip to content

Commit 24e82e0

Browse files
1st11st1
committed
Raw docstrings shouldn't highlight any escapes (as R-strings)
1 parent b3b5464 commit 24e82e0

File tree

4 files changed

+30
-78
lines changed

4 files changed

+30
-78
lines changed

‎grammars/MagicPython.YAML-tmLanguage‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ repository:
125125
'1': {name: punctuation.definition.string.end.python}
126126
patterns:
127127
- include: '#docstring-guts-common'
128-
- include: '#docstring-guts-raw'
129128

130129
- name: string.quoted.docstring.python
131130
begin: (\"\"\")
@@ -148,19 +147,13 @@ repository:
148147
'1': {name: punctuation.definition.string.end.python}
149148
patterns:
150149
- include: '#docstring-guts-common'
151-
- include: '#docstring-guts-raw'
152150

153151
docstring-guts-unicode:
154152
patterns:
155153
- include: '#escape-sequence-unicode'
156154
- include: '#escape-sequence'
157155
- include: '#string-line-continuation'
158156

159-
docstring-guts-raw:
160-
patterns:
161-
- include: '#escape-sequence'
162-
- include: '#string-line-continuation'
163-
164157
docstring-guts-common:
165158
match: |
166159
(?x)

‎grammars/MagicPython.cson‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@ repository:
120120
{
121121
include: "#docstring-guts-common"
122122
}
123-
{
124-
include: "#docstring-guts-raw"
125-
}
126123
]
127124
}
128125
{
@@ -160,9 +157,6 @@ repository:
160157
{
161158
include: "#docstring-guts-common"
162159
}
163-
{
164-
include: "#docstring-guts-raw"
165-
}
166160
]
167161
}
168162
]
@@ -178,15 +172,6 @@ repository:
178172
include: "#string-line-continuation"
179173
}
180174
]
181-
"docstring-guts-raw":
182-
patterns: [
183-
{
184-
include: "#escape-sequence"
185-
}
186-
{
187-
include: "#string-line-continuation"
188-
}
189-
]
190175
"docstring-guts-common":
191176
match: '''
192177
(?x)

‎grammars/MagicPython.tmLanguage‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,6 @@
207207
<key>include</key>
208208
<string>#docstring-guts-common</string>
209209
</dict>
210-
<dict>
211-
<key>include</key>
212-
<string>#docstring-guts-raw</string>
213-
</dict>
214210
</array>
215211
</dict>
216212
<dict>
@@ -282,10 +278,6 @@
282278
<key>include</key>
283279
<string>#docstring-guts-common</string>
284280
</dict>
285-
<dict>
286-
<key>include</key>
287-
<string>#docstring-guts-raw</string>
288-
</dict>
289281
</array>
290282
</dict>
291283
</array>
@@ -308,20 +300,6 @@
308300
</dict>
309301
</array>
310302
</dict>
311-
<key>docstring-guts-raw</key>
312-
<dict>
313-
<key>patterns</key>
314-
<array>
315-
<dict>
316-
<key>include</key>
317-
<string>#escape-sequence</string>
318-
</dict>
319-
<dict>
320-
<key>include</key>
321-
<string>#string-line-continuation</string>
322-
</dict>
323-
</array>
324-
</dict>
325303
<key>docstring-guts-common</key>
326304
<dict>
327305
<key>match</key>

‎test/docstrings/escaping2.py‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,51 +6,47 @@
66
multiline "unicode" string \
77
\xf1 \u1234aaaa \U1234aaaa
88
\N{BLACK SPADE SUIT}
9+
>>> aaa
910
'''
1011

12+
R'''Module docstring
13+
14+
simple \\ string \
15+
foo \' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005
16+
17+
multiline "unicode" string \
18+
\xf1 \u1234aaaa \U1234aaaa
19+
\N{BLACK SPADE SUIT}
20+
>>> aaa
21+
'''
1122

1223

1324
r : source.python, storage.type.string.python, string.quoted.docstring.raw.python
1425
''' : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
1526
Module docstring : source.python, string.quoted.docstring.raw.python
1627
: source.python, string.quoted.docstring.raw.python
17-
simple : source.python, string.quoted.docstring.raw.python
18-
\\ : constant.character.python, source.python, string.quoted.docstring.raw.python
19-
string : source.python, string.quoted.docstring.raw.python
20-
\ : constant.language.python, source.python, string.quoted.docstring.raw.python
21-
foo : source.python, string.quoted.docstring.raw.python
22-
\' : constant.character.python, source.python, string.quoted.docstring.raw.python
23-
: source.python, string.quoted.docstring.raw.python
24-
\" : constant.character.python, source.python, string.quoted.docstring.raw.python
25-
: source.python, string.quoted.docstring.raw.python
26-
\a : constant.character.python, source.python, string.quoted.docstring.raw.python
27-
: source.python, string.quoted.docstring.raw.python
28-
\b : constant.character.python, source.python, string.quoted.docstring.raw.python
29-
\c : source.python, string.quoted.docstring.raw.python
30-
\f : constant.character.python, source.python, string.quoted.docstring.raw.python
31-
: source.python, string.quoted.docstring.raw.python
32-
\n : constant.character.python, source.python, string.quoted.docstring.raw.python
28+
simple \\ string \ : source.python, string.quoted.docstring.raw.python
29+
foo \' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005 : source.python, string.quoted.docstring.raw.python
3330
: source.python, string.quoted.docstring.raw.python
34-
\r : constant.character.python, source.python, string.quoted.docstring.raw.python
35-
: source.python, string.quoted.docstring.raw.python
36-
\t : constant.character.python, source.python, string.quoted.docstring.raw.python
37-
: source.python, string.quoted.docstring.raw.python
38-
\v : constant.character.python, source.python, string.quoted.docstring.raw.python
39-
: source.python, string.quoted.docstring.raw.python
40-
\5 : constant.character.python, source.python, string.quoted.docstring.raw.python
41-
: source.python, string.quoted.docstring.raw.python
42-
\55 : constant.character.python, source.python, string.quoted.docstring.raw.python
43-
: source.python, string.quoted.docstring.raw.python
44-
\555 : constant.character.python, source.python, string.quoted.docstring.raw.python
45-
: source.python, string.quoted.docstring.raw.python
46-
\05 : constant.character.python, source.python, string.quoted.docstring.raw.python
31+
multiline "unicode" string \ : source.python, string.quoted.docstring.raw.python
32+
\xf1 \u1234aaaa \U1234aaaa : source.python, string.quoted.docstring.raw.python
33+
\N{BLACK SPADE SUIT} : source.python, string.quoted.docstring.raw.python
4734
: source.python, string.quoted.docstring.raw.python
48-
\005 : constant.character.python, source.python, string.quoted.docstring.raw.python
35+
>>> : keyword.control.flow.python, source.python, string.quoted.docstring.raw.python
36+
aaa : source.python, string.quoted.docstring.raw.python
37+
''' : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
38+
: source.python
39+
R : source.python, storage.type.string.python, string.quoted.docstring.raw.python
40+
''' : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
41+
Module docstring : source.python, string.quoted.docstring.raw.python
4942
: source.python, string.quoted.docstring.raw.python
50-
multiline "unicode" string : source.python, string.quoted.docstring.raw.python
51-
\ : constant.language.python, source.python, string.quoted.docstring.raw.python
43+
simple \\ string \ : source.python, string.quoted.docstring.raw.python
44+
foo \' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005 : source.python, string.quoted.docstring.raw.python
5245
: source.python, string.quoted.docstring.raw.python
53-
\xf1 : constant.character.python, source.python, string.quoted.docstring.raw.python
54-
\u1234aaaa \U1234aaaa : source.python, string.quoted.docstring.raw.python
46+
multiline "unicode" string \ : source.python, string.quoted.docstring.raw.python
47+
\xf1 \u1234aaaa \U1234aaaa : source.python, string.quoted.docstring.raw.python
5548
\N{BLACK SPADE SUIT} : source.python, string.quoted.docstring.raw.python
49+
: source.python, string.quoted.docstring.raw.python
50+
>>> : keyword.control.flow.python, source.python, string.quoted.docstring.raw.python
51+
aaa : source.python, string.quoted.docstring.raw.python
5652
''' : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python

0 commit comments

Comments
 (0)