Skip to content

Make regex lookahead check more strict #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Make regex lookahead check more strict #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67693f1
Make `regex` lookahead check more strict
RedCMD Feb 13, 2024
435e725
Merge branch 'microsoft:master' into patch-1
RedCMD Oct 3, 2024
2d31dd7
Add `Issue1024.ts` test file
RedCMD Oct 5, 2024
278f8dd
Add `Issue1024.baseline.txt` test file
RedCMD Oct 5, 2024
55678f5
Update `.tmLanguage` files
RedCMD Oct 25, 2024
443dafc
Fix `Issue1024` test
RedCMD Oct 25, 2024
955f5a3
Merge #1032
RedCMD Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions TypeScript.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ variables:
{{functionLikeType}} |
(:\s*(=>|{{matchingParenthesis}}|(<[^<>]*>)|[^<>(),=])+={{functionOrArrowLookup}})
arrowFunctionEnd: (?==>|\{|(^\s*(export|function|class|interface|let|var|{{usingKeyword}}|{{awaitUsingKeyword}}|const|import|enum|namespace|module|type|abstract|declare)\s+))
regexpTail: ([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$])
regexpTail: (?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$])
completeRegexp: \/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/{{regexpTail}})

patterns:
Expand Down Expand Up @@ -1365,7 +1365,7 @@ repository:
begin: (?<=\))\s*{{completeRegexp}}
beginCaptures:
'0': { name: punctuation.definition.string.begin.ts }
end: (/)([dgimsuy]*)
end: (/)([dgimsuvy]*)
endCaptures:
'1': { name: punctuation.definition.string.end.ts }
'2': { name: keyword.other.ts }
Expand Down Expand Up @@ -2793,7 +2793,7 @@ repository:
begin: (?<!\+\+|--|})(?<=[=(:,\[?+!]|{{lookBehindReturn}}|{{lookBehindCase}}|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/{{regexpTail}})
beginCaptures:
'1': { name: punctuation.definition.string.begin.ts }
end: (/)([dgimsuy]*)
end: (/)([dgimsuvy]*)
endCaptures:
'1': { name: punctuation.definition.string.end.ts }
'2': { name: keyword.other.ts}
Expand All @@ -2804,7 +2804,7 @@ repository:
begin: ((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<={{lookBehindReturn}}|{{lookBehindCase}}))\s*){{completeRegexp}}
beginCaptures:
'0': { name: punctuation.definition.string.begin.ts }
end: (/)([dgimsuy]*)
end: (/)([dgimsuvy]*)
endCaptures:
'1': { name: punctuation.definition.string.end.ts }
'2': { name: keyword.other.ts }
Expand Down
12 changes: 6 additions & 6 deletions TypeScript.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4365,7 +4365,7 @@
<key>name</key>
<string>string.regexp.ts</string>
<key>begin</key>
<string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/(?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -4375,7 +4375,7 @@
</dict>
</dict>
<key>end</key>
<string>(/)([dgimsuy]*)</string>
<string>(/)([dgimsuvy]*)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand Down Expand Up @@ -8470,7 +8470,7 @@
<key>name</key>
<string>string.regexp.ts</string>
<key>begin</key>
<string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/(?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
Expand All @@ -8480,7 +8480,7 @@
</dict>
</dict>
<key>end</key>
<string>(/)([dgimsuy]*)</string>
<string>(/)([dgimsuvy]*)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand All @@ -8506,7 +8506,7 @@
<key>name</key>
<string>string.regexp.ts</string>
<key>begin</key>
<string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/(?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -8516,7 +8516,7 @@
</dict>
</dict>
<key>end</key>
<string>(/)([dgimsuy]*)</string>
<string>(/)([dgimsuvy]*)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand Down
12 changes: 6 additions & 6 deletions TypeScriptReact.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4387,7 +4387,7 @@
<key>name</key>
<string>string.regexp.tsx</string>
<key>begin</key>
<string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/(?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -4397,7 +4397,7 @@
</dict>
</dict>
<key>end</key>
<string>(/)([dgimsuy]*)</string>
<string>(/)([dgimsuvy]*)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand Down Expand Up @@ -8418,7 +8418,7 @@
<key>name</key>
<string>string.regexp.tsx</string>
<key>begin</key>
<string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/(?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
Expand All @@ -8428,7 +8428,7 @@
</dict>
</dict>
<key>end</key>
<string>(/)([dgimsuy]*)</string>
<string>(/)([dgimsuvy]*)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand All @@ -8454,7 +8454,7 @@
<key>name</key>
<string>string.regexp.tsx</string>
<key>begin</key>
<string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/(?!\*)[dgimsuvy]*((?!\/)|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -8464,7 +8464,7 @@
</dict>
</dict>
<key>end</key>
<string>(/)([dgimsuy]*)</string>
<string>(/)([dgimsuvy]*)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand Down
38 changes: 38 additions & 0 deletions tests/baselines/Issue1024.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
original file
-----------------------------------
1
/ f(/u/g);

-----------------------------------

Grammar: TypeScript.tmLanguage
-----------------------------------
>1
^
source.ts constant.numeric.decimal.ts
> / f(/u/g);
^
source.ts
^
source.ts keyword.operator.arithmetic.ts
^
source.ts
^
source.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.brace.round.ts
^
source.ts string.regexp.ts punctuation.definition.string.begin.ts
^
source.ts string.regexp.ts
^
source.ts string.regexp.ts punctuation.definition.string.end.ts
^
source.ts string.regexp.ts keyword.other.ts
^
source.ts meta.brace.round.ts
^
source.ts punctuation.terminator.statement.ts
>
^
source.ts
2 changes: 2 additions & 0 deletions tests/cases/Issue1024.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1
/ f(/u/g);