Skip to content

Commit cfd2afb

Browse files
sheetalkamatsheetalkamat
committed
Fix the regex start
Fixes #243 and #3
1 parent c1c0c65 commit cfd2afb

File tree

8 files changed

+2459
-4
lines changed

8 files changed

+2459
-4
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ repository:
10551055

10561056
regex:
10571057
name: string.regex.ts
1058-
begin: (?<=[=(:,\[?+!]|^|return|=>|&&|\|\|)\s*(/)(?![/*+{}?])(?=.*/)
1058+
begin: (?<=[=(:,\[?+!]|^|return|case|=>|&&|\|\||\*\/)\s*(/)(?![/*+{}?])(?=.*/)
10591059
beginCaptures:
10601060
'1': {name: punctuation.definition.string.begin.ts}
10611061
end: (/)([gimuy]*)

‎TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2798,7 +2798,7 @@
27982798
<key>regex</key>
27992799
<dict>
28002800
<key>begin</key>
2801-
<string>(?&lt;=[=(:,\[?+!]|^|return|=&gt;|&amp;&amp;|\|\|)\s*(/)(?![/*+{}?])(?=.*/)</string>
2801+
<string>(?&lt;=[=(:,\[?+!]|^|return|case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(/)(?![/*+{}?])(?=.*/)</string>
28022802
<key>beginCaptures</key>
28032803
<dict>
28042804
<key>1</key>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ repository:
10441044

10451045
regex:
10461046
name: string.regex.tsx
1047-
begin: (?<=[=(:,\[?+!]|^|return|=>|&&|\|\|)\s*(/)(?![/*+{}?])(?=.*/)
1047+
begin: (?<=[=(:,\[?+!]|^|return|case|=>|&&|\|\||\*\/)\s*(/)(?![/*+{}?])(?=.*/)
10481048
beginCaptures:
10491049
'1': {name: punctuation.definition.string.begin.tsx}
10501050
end: (/)([gimuy]*)

‎TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3184,7 +3184,7 @@
31843184
<key>regex</key>
31853185
<dict>
31863186
<key>begin</key>
3187-
<string>(?&lt;=[=(:,\[?+!]|^|return|=&gt;|&amp;&amp;|\|\|)\s*(/)(?![/*+{}?])(?=.*/)</string>
3187+
<string>(?&lt;=[=(:,\[?+!]|^|return|case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(/)(?![/*+{}?])(?=.*/)</string>
31883188
<key>beginCaptures</key>
31893189
<dict>
31903190
<key>1</key>

‎tests/baselines/Issue243.baseline.txt

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

‎tests/baselines/Issue3.baseline.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
original file
2+
-----------------------------------
3+
let regex = /**/ /foo/;
4+
-----------------------------------
5+
6+
>let regex = /**/ /foo/;
7+
^^^
8+
source.ts meta.var.expr.ts storage.type.ts
9+
^
10+
source.ts meta.var.expr.ts
11+
^^^^^
12+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
13+
^
14+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
15+
^
16+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
17+
^
18+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
19+
^^
20+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts
21+
^^
22+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts
23+
^
24+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts
25+
^
26+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts punctuation.definition.string.begin.ts
27+
^^^
28+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts
29+
^
30+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts punctuation.definition.string.end.ts
31+
^^
32+
source.ts

‎tests/cases/Issue243.ts

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
'use strict';
2+
3+
var pieces = [];
4+
var numeration = [];
5+
6+
for (var i in pieces) {
7+
switch (true) {
8+
case /^\"?Accession\"?/.test(pieces[i]):
9+
numeration[0] = i;
10+
break;
11+
case /^\"?Accession\"?/.test(pieces[i]):
12+
numeration[0] = i;
13+
break;
14+
case /^\"?Accession\"?/.test(pieces[i]):
15+
numeration[0] = i;
16+
break;
17+
case /^\"?Accession\"?/.test(pieces[i]):
18+
numeration[0] = i;
19+
break;
20+
case /^\"?Accession\"?/.test(pieces[i]):
21+
numeration[0] = i;
22+
break;
23+
case /^\"?Accession\"?/.test(pieces[i]):
24+
numeration[0] = i;
25+
break;
26+
case /^\"?Accession\"?/.test(pieces[i]):
27+
numeration[0] = i;
28+
break;
29+
case /^\"?Accession\"?/.test(pieces[i]):
30+
numeration[0] = i;
31+
break;
32+
case /^\"?Accession\"?/.test(pieces[i]):
33+
numeration[0] = i;
34+
break;
35+
case /^\"?Accession\"?/.test(pieces[i]):
36+
numeration[0] = i;
37+
break;
38+
case /^\"?Accession\"?/.test(pieces[i]):
39+
numeration[0] = i;
40+
break;
41+
case /^\"?Accession\"?/.test(pieces[i]):
42+
numeration[0] = i;
43+
break;
44+
case /^\"?Accession\"?/.test(pieces[i]):
45+
numeration[0] = i;
46+
break;
47+
case /^\"?Accession\"?/.test(pieces[i]):
48+
numeration[0] = i;
49+
break;
50+
case /^\"?Accession\"?/.test(pieces[i]):
51+
numeration[0] = i;
52+
break;
53+
case /^\"?Accession\"?/.test(pieces[i]):
54+
numeration[0] = i;
55+
break;
56+
case /^\"?Accession\"?/.test(pieces[i]):
57+
numeration[0] = i;
58+
break;
59+
case /^\"?Accession\"?/.test(pieces[i]):
60+
numeration[0] = i;
61+
break;
62+
case /^\"?Accession\"?/.test(pieces[i]):
63+
numeration[0] = i;
64+
break;
65+
case /^\"?Accession\"?/.test(pieces[i]):
66+
numeration[0] = i;
67+
break;
68+
case /^\"?Accession\"?/.test(pieces[i]):
69+
numeration[0] = i;
70+
break;
71+
case /^\"?Accession\"?/.test(pieces[i]):
72+
numeration[0] = i;
73+
break;
74+
case /^\"?Accession\"?/.test(pieces[i]):
75+
numeration[0] = i;
76+
break;
77+
case /^\"?Accession\"?/.test(pieces[i]):
78+
numeration[0] = i;
79+
break;
80+
case /^\"?Accession\"?/.test(pieces[i]):
81+
numeration[0] = i;
82+
break;
83+
case /^\"?Accession\"?/.test(pieces[i]):
84+
numeration[0] = i;
85+
break;
86+
case /^\"?Accession\"?/.test(pieces[i]):
87+
numeration[0] = i;
88+
break;
89+
case /^\"?Accession\"?/.test(pieces[i]):
90+
numeration[0] = i;
91+
break;
92+
case /^\"?Accession\"?/.test(pieces[i]):
93+
numeration[0] = i;
94+
break;
95+
case /^\"?Accession\"?/.test(pieces[i]):
96+
numeration[0] = i;
97+
break;
98+
case /^\"?Accession\"?/.test(pieces[i]):
99+
numeration[0] = i;
100+
break;
101+
case /^\"?Accession\"?/.test(pieces[i]):
102+
numeration[0] = i;
103+
break;
104+
case /^\"?Accession\"?/.test(pieces[i]):
105+
numeration[0] = i;
106+
break;
107+
}
108+
}

‎tests/cases/Issue3.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
let regex = /**/ /foo/;

0 commit comments

Comments
 (0)