Skip to content

Commit dbac61e

Browse files
committed
Rename scope string.regex to string.regexp
Fixes #409
1 parent bbd6e44 commit dbac61e

11 files changed

+408
-408
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ repository:
17111711

17121712
regex:
17131713
patterns:
1714-
- name: string.regex.ts
1714+
- name: string.regexp.ts
17151715
begin: (?<=[=(:,\[?+!]|return|case|=>|&&|\|\||\*\/)\s*(/)(?![/*])(?=(?:[^/\\\[]|\\.|\[([^\]\\]|\\.)+\])+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))
17161716
beginCaptures:
17171717
'1': {name: punctuation.definition.string.begin.ts}
@@ -1722,7 +1722,7 @@ repository:
17221722
patterns:
17231723
- include: '#regexp'
17241724
# Check if complete regexp syntax
1725-
- name: string.regex.ts
1725+
- name: string.regexp.ts
17261726
begin: (?<![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\[]|\\.|\[([^\]\\]|\\.)+\])+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))
17271727
beginCaptures:
17281728
'0': {name: punctuation.definition.string.begin.ts}

TypeScript.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4686,7 +4686,7 @@
46864686
<array>
46874687
<dict>
46884688
<key>name</key>
4689-
<string>string.regex.ts</string>
4689+
<string>string.regexp.ts</string>
46904690
<key>begin</key>
46914691
<string>(?&lt;=[=(:,\[?+!]|return|case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(/)(?![/*])(?=(?:[^/\\\[]|\\.|\[([^\]\\]|\\.)+\])+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))</string>
46924692
<key>beginCaptures</key>
@@ -4722,7 +4722,7 @@
47224722
</dict>
47234723
<dict>
47244724
<key>name</key>
4725-
<string>string.regex.ts</string>
4725+
<string>string.regexp.ts</string>
47264726
<key>begin</key>
47274727
<string>(?&lt;![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\[]|\\.|\[([^\]\\]|\\.)+\])+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))</string>
47284728
<key>beginCaptures</key>

TypeScriptReact.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4668,7 +4668,7 @@
46684668
<array>
46694669
<dict>
46704670
<key>name</key>
4671-
<string>string.regex.tsx</string>
4671+
<string>string.regexp.tsx</string>
46724672
<key>begin</key>
46734673
<string>(?&lt;=[=(:,\[?+!]|return|case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(/)(?![/*])(?=(?:[^/\\\[]|\\.|\[([^\]\\]|\\.)+\])+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))</string>
46744674
<key>beginCaptures</key>
@@ -4704,7 +4704,7 @@
47044704
</dict>
47054705
<dict>
47064706
<key>name</key>
4707-
<string>string.regex.tsx</string>
4707+
<string>string.regexp.tsx</string>
47084708
<key>begin</key>
47094709
<string>(?&lt;![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\[]|\\.|\[([^\]\\]|\\.)+\])+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))</string>
47104710
<key>beginCaptures</key>

tests/baselines/Issue177.baseline.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Grammar: TypeScript.tmLanguage
2020
^
2121
source.ts meta.brace.round.ts
2222
^
23-
source.ts string.regex.ts punctuation.definition.string.begin.ts
23+
source.ts string.regexp.ts punctuation.definition.string.begin.ts
2424
^
25-
source.ts string.regex.ts
25+
source.ts string.regexp.ts
2626
^
27-
source.ts string.regex.ts punctuation.definition.string.end.ts
27+
source.ts string.regexp.ts punctuation.definition.string.end.ts
2828
^
2929
source.ts meta.brace.round.ts
3030
^
@@ -41,12 +41,12 @@ Grammar: TypeScript.tmLanguage
4141
^^
4242
source.ts meta.arrow.ts storage.type.function.arrow.ts
4343
^
44-
source.ts meta.arrow.ts string.regex.ts
44+
source.ts meta.arrow.ts string.regexp.ts
4545
^
46-
source.ts meta.arrow.ts string.regex.ts punctuation.definition.string.begin.ts
46+
source.ts meta.arrow.ts string.regexp.ts punctuation.definition.string.begin.ts
4747
^
48-
source.ts meta.arrow.ts string.regex.ts
48+
source.ts meta.arrow.ts string.regexp.ts
4949
^
50-
source.ts meta.arrow.ts string.regex.ts punctuation.definition.string.end.ts
50+
source.ts meta.arrow.ts string.regexp.ts punctuation.definition.string.end.ts
5151
^
5252
source.ts punctuation.terminator.statement.ts

tests/baselines/Issue243.baseline.txt

Lines changed: 297 additions & 297 deletions
Large diffs are not rendered by default.

tests/baselines/Issue3.baseline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ Grammar: TypeScript.tmLanguage
2323
^^
2424
source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts
2525
^
26-
source.ts meta.var.expr.ts string.regex.ts
26+
source.ts meta.var.expr.ts string.regexp.ts
2727
^
28-
source.ts meta.var.expr.ts string.regex.ts punctuation.definition.string.begin.ts
28+
source.ts meta.var.expr.ts string.regexp.ts punctuation.definition.string.begin.ts
2929
^^^
30-
source.ts meta.var.expr.ts string.regex.ts
30+
source.ts meta.var.expr.ts string.regexp.ts
3131
^
32-
source.ts meta.var.expr.ts string.regex.ts punctuation.definition.string.end.ts
32+
source.ts meta.var.expr.ts string.regexp.ts punctuation.definition.string.end.ts
3333
^
3434
source.ts punctuation.terminator.statement.ts

tests/baselines/Issue318.baseline.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ Grammar: TypeScript.tmLanguage
3030
^^^^^^^^
3131
source.ts
3232
^
33-
source.ts string.regex.ts punctuation.definition.string.begin.ts
33+
source.ts string.regexp.ts punctuation.definition.string.begin.ts
3434
^
35-
source.ts string.regex.ts keyword.control.anchor.regexp
35+
source.ts string.regexp.ts keyword.control.anchor.regexp
3636
^^^^^^^^^^^^^^^^^^^^^^^^^^
37-
source.ts string.regex.ts
37+
source.ts string.regexp.ts
3838
^
39-
source.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp
39+
source.ts string.regexp.ts meta.group.regexp punctuation.definition.group.regexp
4040
^
41-
source.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
41+
source.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
4242
^
43-
source.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp keyword.operator.negation.regexp
43+
source.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp keyword.operator.negation.regexp
4444
^
45-
source.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp
45+
source.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp
4646
^
47-
source.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
47+
source.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
4848
^
49-
source.ts string.regex.ts meta.group.regexp keyword.operator.quantifier.regexp
49+
source.ts string.regexp.ts meta.group.regexp keyword.operator.quantifier.regexp
5050
^
51-
source.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp
51+
source.ts string.regexp.ts meta.group.regexp punctuation.definition.group.regexp
5252
^
53-
source.ts string.regex.ts
53+
source.ts string.regexp.ts
5454
^
55-
source.ts string.regex.ts keyword.control.anchor.regexp
55+
source.ts string.regexp.ts keyword.control.anchor.regexp
5656
^
57-
source.ts string.regex.ts punctuation.definition.string.end.ts
57+
source.ts string.regexp.ts punctuation.definition.string.end.ts
5858
^
5959
source.ts punctuation.separator.comma.ts
6060
^^

tests/baselines/Issue356.baseline.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,29 +130,29 @@ Grammar: TypeScript.tmLanguage
130130
^
131131
source.ts meta.function.ts meta.block.ts meta.brace.round.ts
132132
^
133-
source.ts meta.function.ts meta.block.ts string.regex.ts punctuation.definition.string.begin.ts
133+
source.ts meta.function.ts meta.block.ts string.regexp.ts punctuation.definition.string.begin.ts
134134
^
135-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp
135+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp punctuation.definition.group.regexp
136136
^^
137-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp constant.character.escape.backslash.regexp
137+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp constant.character.escape.backslash.regexp
138138
^
139-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
139+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
140140
^^
141-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp constant.other.character-class.regexp
141+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp constant.other.character-class.regexp
142142
^
143-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
143+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp
144144
^^^
145-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp keyword.operator.quantifier.regexp
145+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp keyword.operator.quantifier.regexp
146146
^
147-
source.ts meta.function.ts meta.block.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp
147+
source.ts meta.function.ts meta.block.ts string.regexp.ts meta.group.regexp punctuation.definition.group.regexp
148148
^^
149-
source.ts meta.function.ts meta.block.ts string.regex.ts constant.other.character-class.regexp
149+
source.ts meta.function.ts meta.block.ts string.regexp.ts constant.other.character-class.regexp
150150
^
151-
source.ts meta.function.ts meta.block.ts string.regex.ts keyword.operator.quantifier.regexp
151+
source.ts meta.function.ts meta.block.ts string.regexp.ts keyword.operator.quantifier.regexp
152152
^
153-
source.ts meta.function.ts meta.block.ts string.regex.ts keyword.control.anchor.regexp
153+
source.ts meta.function.ts meta.block.ts string.regexp.ts keyword.control.anchor.regexp
154154
^
155-
source.ts meta.function.ts meta.block.ts string.regex.ts punctuation.definition.string.end.ts
155+
source.ts meta.function.ts meta.block.ts string.regexp.ts punctuation.definition.string.end.ts
156156
^
157157
source.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts
158158
^

tests/baselines/Issue377.baseline.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ Grammar: TypeScript.tmLanguage
7878
^
7979
source.ts meta.brace.round.ts
8080
^
81-
source.ts string.regex.ts punctuation.definition.string.begin.ts
81+
source.ts string.regexp.ts punctuation.definition.string.begin.ts
8282
^^
83-
source.ts string.regex.ts constant.character.escape.backslash.regexp
83+
source.ts string.regexp.ts constant.character.escape.backslash.regexp
8484
^
85-
source.ts string.regex.ts keyword.operator.quantifier.regexp
85+
source.ts string.regexp.ts keyword.operator.quantifier.regexp
8686
^
87-
source.ts string.regex.ts
87+
source.ts string.regexp.ts
8888
^
89-
source.ts string.regex.ts keyword.operator.quantifier.regexp
89+
source.ts string.regexp.ts keyword.operator.quantifier.regexp
9090
^
91-
source.ts string.regex.ts keyword.control.anchor.regexp
91+
source.ts string.regexp.ts keyword.control.anchor.regexp
9292
^
93-
source.ts string.regex.ts punctuation.definition.string.end.ts
93+
source.ts string.regexp.ts punctuation.definition.string.end.ts
9494
^
9595
source.ts punctuation.separator.comma.ts
9696
^

0 commit comments

Comments
 (0)