Skip to content

Commit e26b18d

Browse files
1st11st1
committed
Make scopes for single-line rx more consistent with regular strings
1 parent 92bed5a commit e26b18d

16 files changed

+160
-160
lines changed

Diff for: ‎grammars/MagicPython.cson

+2-2
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ repository:
596596
}
597597
]
598598
"regexp-single-quoted-single-line":
599-
name: "string.regexp.quoted.python"
599+
name: "string.regexp.quoted.single.python"
600600
begin: "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')"
601601
end: "(\\')|(?<!\\\\)(\\n)"
602602
beginCaptures:
@@ -619,7 +619,7 @@ repository:
619619
}
620620
]
621621
"regexp-double-quoted-single-line":
622-
name: "string.regexp.quoted.python"
622+
name: "string.regexp.quoted.single.python"
623623
begin: "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\\")"
624624
end: "(\\\")|(?<!\\\\)(\\n)"
625625
beginCaptures:

Diff for: ‎grammars/MagicPython.syntax.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ repository:
438438
- include: '#regexp-double-quoted-single-line'
439439

440440
regexp-single-quoted-single-line:
441-
name: string.regexp.quoted.python
441+
name: string.regexp.quoted.single.python
442442
begin: \b(([uU]r)|([bB]r)|(r[bB]?))(\')
443443
end: (\')|(?<!\\)(\n)
444444
beginCaptures:
@@ -453,7 +453,7 @@ repository:
453453
- include: '#single-one-regexp-expression'
454454

455455
regexp-double-quoted-single-line:
456-
name: string.regexp.quoted.python
456+
name: string.regexp.quoted.single.python
457457
begin: \b(([uU]r)|([bB]r)|(r[bB]?))(\")
458458
end: (\")|(?<!\\)(\n)
459459
beginCaptures:

Diff for: ‎grammars/MagicPython.tmLanguage

+2-2
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@
927927
<key>regexp-single-quoted-single-line</key>
928928
<dict>
929929
<key>name</key>
930-
<string>string.regexp.quoted.python</string>
930+
<string>string.regexp.quoted.single.python</string>
931931
<key>begin</key>
932932
<string>\b(([uU]r)|([bB]r)|(r[bB]?))(\&apos;)</string>
933933
<key>end</key>
@@ -979,7 +979,7 @@
979979
<key>regexp-double-quoted-single-line</key>
980980
<dict>
981981
<key>name</key>
982-
<string>string.regexp.quoted.python</string>
982+
<string>string.regexp.quoted.single.python</string>
983983
<key>begin</key>
984984
<string>\b(([uU]r)|([bB]r)|(r[bB]?))(\&quot;)</string>
985985
<key>end</key>

Diff for: ‎misc/scopes

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ string.quoted.raw.multi.python
131131
string.quoted.raw.single.python
132132
string.quoted.single.python
133133
string.regexp.quoted.multi.python
134-
string.regexp.quoted.python
134+
string.regexp.quoted.single.python
135135
support.function.builtin.python
136136
support.function.magic.python
137137
support.other.escape.special.regexp

Diff for: ‎test/docstrings/continuation3.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
: source.python
1616
\ : separator.continuation.line.python, source.python
1717
: source.python
18-
r : source.python, storage.type.string.python, string.regexp.quoted.python
19-
' : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
20-
>>> print : source.python, string.regexp.quoted.python
21-
( : punctuation.parenthesis.begin.regexp, source.python, string.regexp.quoted.python, support.other.parenthesis.regexp
22-
42 : source.python, string.regexp.quoted.python
23-
) : punctuation.parenthesis.end.regexp, source.python, string.regexp.quoted.python, support.other.parenthesis.regexp
24-
a : source.python, string.regexp.quoted.python
25-
[ : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.python
26-
w : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
27-
e : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
28-
r : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
29-
] : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.python
30-
' : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
18+
r : source.python, storage.type.string.python, string.regexp.quoted.single.python
19+
' : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.single.python
20+
>>> print : source.python, string.regexp.quoted.single.python
21+
( : punctuation.parenthesis.begin.regexp, source.python, string.regexp.quoted.single.python, support.other.parenthesis.regexp
22+
42 : source.python, string.regexp.quoted.single.python
23+
) : punctuation.parenthesis.end.regexp, source.python, string.regexp.quoted.single.python, support.other.parenthesis.regexp
24+
a : source.python, string.regexp.quoted.single.python
25+
[ : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.single.python
26+
w : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
27+
e : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
28+
r : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
29+
] : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.single.python
30+
' : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
3131
: source.python
3232
b : source.python
3333
= : keyword.operator.assignment.python, source.python

Diff for: ‎test/regexp/python1.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
a : source.python
77
= : keyword.operator.assignment.python, source.python
88
: source.python
9-
r : source.python, storage.type.string.python, string.regexp.quoted.python
10-
' : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
11-
[ : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.python
12-
a : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
13-
- : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
14-
z : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
15-
] : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.python
16-
' : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
9+
r : source.python, storage.type.string.python, string.regexp.quoted.single.python
10+
' : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.single.python
11+
[ : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.single.python
12+
a : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
13+
- : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
14+
z : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
15+
] : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.single.python
16+
' : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
1717
a : source.python
1818
= : keyword.operator.assignment.python, source.python
1919
: source.python

0 commit comments

Comments
 (0)