Add 'd' flag from the RegExp Match Indices proposal

microsoft · Mar 9, 2021 · 5f916dd · 5f916dd
1 parent d3c203d
commit 5f916dd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -135,7 +135,7 @@ variables:
  {{functionLikeType}} |
  (:\s*(=>|{{matchingParenthesis}}|(<[^<>]*>)|[^<>(),=])+={{functionOrArrowLookup}})
  arrowFunctionEnd: (?==>|\{|(^\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\s+))
- regexpTail: ([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$])
+ regexpTail: ([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$])
  completeRegexp: \/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/{{regexpTail}})
 
 patterns:
@@ -1306,7 +1306,7 @@ repository:
  begin: (?<=\))\s*{{completeRegexp}}
  beginCaptures:
  '0': { name: punctuation.definition.string.begin.ts }
- end: (/)([gimsuy]*)
+ end: (/)([dgimsuy]*)
  endCaptures:
  '1': { name: punctuation.definition.string.end.ts }
  '2': { name: keyword.other.ts }
@@ -2724,7 +2724,7 @@ repository:
  begin: (?<!\+\+|--|})(?<=[=(:,\[?+!]|{{lookBehindReturn}}|{{lookBehindCase}}|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/{{regexpTail}})
  beginCaptures:
  '1': { name: punctuation.definition.string.begin.ts }
- end: (/)([gimsuy]*)
+ end: (/)([dgimsuy]*)
  endCaptures:
  '1': { name: punctuation.definition.string.end.ts }
  '2': { name: keyword.other.ts}
@@ -2735,7 +2735,7 @@ repository:
  begin: ((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<={{lookBehindReturn}}|{{lookBehindCase}}))\s*){{completeRegexp}}
  beginCaptures:
  '0': { name: punctuation.definition.string.begin.ts }
- end: (/)([gimsuy]*)
+ end: (/)([dgimsuy]*)
  endCaptures:
  '1': { name: punctuation.definition.string.end.ts }
  '2': { name: keyword.other.ts }

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -4168,7 +4168,7 @@
  <key>name</key>
  <string>string.regexp.ts</string>
  <key>begin</key>
- <string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
+ <string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
  <key>beginCaptures</key>
  <dict>
  <key>0</key>
@@ -4178,7 +4178,7 @@
  </dict>
  </dict>
  <key>end</key>
- <string>(/)([gimsuy]*)</string>
+ <string>(/)([dgimsuy]*)</string>
  <key>endCaptures</key>
  <dict>
  <key>1</key>
@@ -8227,7 +8227,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*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
+ <string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
  <key>beginCaptures</key>
  <dict>
  <key>1</key>
@@ -8237,7 +8237,7 @@
  </dict>
  </dict>
  <key>end</key>
- <string>(/)([gimsuy]*)</string>
+ <string>(/)([dgimsuy]*)</string>
  <key>endCaptures</key>
  <dict>
  <key>1</key>
@@ -8263,7 +8263,7 @@
  <key>name</key>
  <string>string.regexp.ts</string>
  <key>begin</key>
- <string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
+ <string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
  <key>beginCaptures</key>
  <dict>
  <key>0</key>
@@ -8273,7 +8273,7 @@
  </dict>
  </dict>
  <key>end</key>
- <string>(/)([gimsuy]*)</string>
+ <string>(/)([dgimsuy]*)</string>
  <key>endCaptures</key>
  <dict>
  <key>1</key>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -4190,7 +4190,7 @@
  <key>name</key>
  <string>string.regexp.tsx</string>
  <key>begin</key>
- <string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
+ <string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
  <key>beginCaptures</key>
  <dict>
  <key>0</key>
@@ -4200,7 +4200,7 @@
  </dict>
  </dict>
  <key>end</key>
- <string>(/)([gimsuy]*)</string>
+ <string>(/)([dgimsuy]*)</string>
  <key>endCaptures</key>
  <dict>
  <key>1</key>
@@ -8175,7 +8175,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*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
+ <string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
  <key>beginCaptures</key>
  <dict>
  <key>1</key>
@@ -8185,7 +8185,7 @@
  </dict>
  </dict>
  <key>end</key>
- <string>(/)([gimsuy]*)</string>
+ <string>(/)([dgimsuy]*)</string>
  <key>endCaptures</key>
  <dict>
  <key>1</key>
@@ -8211,7 +8211,7 @@
  <key>name</key>
  <string>string.regexp.tsx</string>
  <key>begin</key>
- <string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
+ <string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
  <key>beginCaptures</key>
  <dict>
  <key>0</key>
@@ -8221,7 +8221,7 @@
  </dict>
  </dict>
  <key>end</key>
- <string>(/)([gimsuy]*)</string>
+ <string>(/)([dgimsuy]*)</string>
  <key>endCaptures</key>
  <dict>
  <key>1</key>

diff --git a/tests/cases/regexp.ts b/tests/cases/regexp.ts
@@ -1,2 +1,3 @@
 var a = /(?:([a-zA-Z_$][\w$])*)/i;
-var x = /\s*\b(async\s+)?function\b/g;
+var x = /\s*\b(async\s+)?function\b/g;
+var d = /\s*\b(async\s+)?function\b/d;