Skip to content

Commit 70cf5d3

Browse files
author
Yury Selivanov
committed
Compress docstrings rules
1 parent c0f0745 commit 70cf5d3

3 files changed

Lines changed: 12 additions & 142 deletions

File tree

‎grammars/MagicPython.YAML-tmLanguage‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ repository:
113113
docstring:
114114
patterns:
115115
- name: string.quoted.docstring.python
116-
begin: (\'\'\')
117-
end: (\'\'\')
116+
begin: (\'\'\'|\"\"\")
117+
end: (\1)
118118
beginCaptures:
119119
'1': {name: punctuation.definition.string.begin.python}
120120
endCaptures:
@@ -124,30 +124,8 @@ repository:
124124
- include: '#docstring-guts-unicode'
125125

126126
- name: string.quoted.docstring.raw.python
127-
begin: ([rR])(\'\'\')
128-
end: (\'\'\')
129-
beginCaptures:
130-
'1': {name: storage.type.string.python}
131-
'2': {name: punctuation.definition.string.begin.python}
132-
endCaptures:
133-
'1': {name: punctuation.definition.string.end.python}
134-
patterns:
135-
- include: '#docstring-guts-common'
136-
137-
- name: string.quoted.docstring.python
138-
begin: (\"\"\")
139-
end: (\"\"\")
140-
beginCaptures:
141-
'1': {name: punctuation.definition.string.begin.python}
142-
endCaptures:
143-
'1': {name: punctuation.definition.string.end.python}
144-
patterns:
145-
- include: '#docstring-guts-common'
146-
- include: '#docstring-guts-unicode'
147-
148-
- name: string.quoted.docstring.raw.python
149-
begin: ([rR])(\"\"\")
150-
end: (\"\"\")
127+
begin: ([rR])(\'\'\'|\"\"\")
128+
end: (\2)
151129
beginCaptures:
152130
'1': {name: storage.type.string.python}
153131
'2': {name: punctuation.definition.string.begin.python}

‎grammars/MagicPython.cson‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ repository:
7979
patterns: [
8080
{
8181
name: "string.quoted.docstring.python"
82-
begin: "(\\'\\'\\')"
83-
end: "(\\'\\'\\')"
82+
begin: "(\\'\\'\\'|\\\"\\\"\\\")"
83+
end: "(\\1)"
8484
beginCaptures:
8585
"1":
8686
name: "punctuation.definition.string.begin.python"
@@ -98,45 +98,8 @@ repository:
9898
}
9999
{
100100
name: "string.quoted.docstring.raw.python"
101-
begin: "([rR])(\\'\\'\\')"
102-
end: "(\\'\\'\\')"
103-
beginCaptures:
104-
"1":
105-
name: "storage.type.string.python"
106-
"2":
107-
name: "punctuation.definition.string.begin.python"
108-
endCaptures:
109-
"1":
110-
name: "punctuation.definition.string.end.python"
111-
patterns: [
112-
{
113-
include: "#docstring-guts-common"
114-
}
115-
]
116-
}
117-
{
118-
name: "string.quoted.docstring.python"
119-
begin: "(\\\"\\\"\\\")"
120-
end: "(\\\"\\\"\\\")"
121-
beginCaptures:
122-
"1":
123-
name: "punctuation.definition.string.begin.python"
124-
endCaptures:
125-
"1":
126-
name: "punctuation.definition.string.end.python"
127-
patterns: [
128-
{
129-
include: "#docstring-guts-common"
130-
}
131-
{
132-
include: "#docstring-guts-unicode"
133-
}
134-
]
135-
}
136-
{
137-
name: "string.quoted.docstring.raw.python"
138-
begin: "([rR])(\\\"\\\"\\\")"
139-
end: "(\\\"\\\"\\\")"
101+
begin: "([rR])(\\'\\'\\'|\\\"\\\"\\\")"
102+
end: "(\\2)"
140103
beginCaptures:
141104
"1":
142105
name: "storage.type.string.python"

‎grammars/MagicPython.tmLanguage‎

Lines changed: 4 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@
122122
<key>name</key>
123123
<string>string.quoted.docstring.python</string>
124124
<key>begin</key>
125-
<string>(\&apos;\&apos;\&apos;)</string>
125+
<string>(\&apos;\&apos;\&apos;|\&quot;\&quot;\&quot;)</string>
126126
<key>end</key>
127-
<string>(\&apos;\&apos;\&apos;)</string>
127+
<string>(\1)</string>
128128
<key>beginCaptures</key>
129129
<dict>
130130
<key>1</key>
@@ -157,80 +157,9 @@
157157
<key>name</key>
158158
<string>string.quoted.docstring.raw.python</string>
159159
<key>begin</key>
160-
<string>([rR])(\&apos;\&apos;\&apos;)</string>
160+
<string>([rR])(\&apos;\&apos;\&apos;|\&quot;\&quot;\&quot;)</string>
161161
<key>end</key>
162-
<string>(\&apos;\&apos;\&apos;)</string>
163-
<key>beginCaptures</key>
164-
<dict>
165-
<key>1</key>
166-
<dict>
167-
<key>name</key>
168-
<string>storage.type.string.python</string>
169-
</dict>
170-
<key>2</key>
171-
<dict>
172-
<key>name</key>
173-
<string>punctuation.definition.string.begin.python</string>
174-
</dict>
175-
</dict>
176-
<key>endCaptures</key>
177-
<dict>
178-
<key>1</key>
179-
<dict>
180-
<key>name</key>
181-
<string>punctuation.definition.string.end.python</string>
182-
</dict>
183-
</dict>
184-
<key>patterns</key>
185-
<array>
186-
<dict>
187-
<key>include</key>
188-
<string>#docstring-guts-common</string>
189-
</dict>
190-
</array>
191-
</dict>
192-
<dict>
193-
<key>name</key>
194-
<string>string.quoted.docstring.python</string>
195-
<key>begin</key>
196-
<string>(\&quot;\&quot;\&quot;)</string>
197-
<key>end</key>
198-
<string>(\&quot;\&quot;\&quot;)</string>
199-
<key>beginCaptures</key>
200-
<dict>
201-
<key>1</key>
202-
<dict>
203-
<key>name</key>
204-
<string>punctuation.definition.string.begin.python</string>
205-
</dict>
206-
</dict>
207-
<key>endCaptures</key>
208-
<dict>
209-
<key>1</key>
210-
<dict>
211-
<key>name</key>
212-
<string>punctuation.definition.string.end.python</string>
213-
</dict>
214-
</dict>
215-
<key>patterns</key>
216-
<array>
217-
<dict>
218-
<key>include</key>
219-
<string>#docstring-guts-common</string>
220-
</dict>
221-
<dict>
222-
<key>include</key>
223-
<string>#docstring-guts-unicode</string>
224-
</dict>
225-
</array>
226-
</dict>
227-
<dict>
228-
<key>name</key>
229-
<string>string.quoted.docstring.raw.python</string>
230-
<key>begin</key>
231-
<string>([rR])(\&quot;\&quot;\&quot;)</string>
232-
<key>end</key>
233-
<string>(\&quot;\&quot;\&quot;)</string>
162+
<string>(\2)</string>
234163
<key>beginCaptures</key>
235164
<dict>
236165
<key>1</key>

0 commit comments

Comments
 (0)