Merge pull request #139 from spahnke/regexp-match-indices

[JS/TS] Add support for the RegExp Match Indices flag
pull/2748/head
Henning Dieterichs 4 years ago committed by GitHub
commit 6148b8a130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -652,7 +652,7 @@ testTokenization('javascript', [
[ [
{ {
line: '/foo/gimsuy', line: '/foo/dgimsuy',
tokens: [ tokens: [
{ startIndex: 0, type: 'regexp.js' }, { startIndex: 0, type: 'regexp.js' },
{ startIndex: 5, type: 'keyword.other.js' } { startIndex: 5, type: 'keyword.other.js' }

@ -674,7 +674,7 @@ testTokenization('typescript', [
[ [
{ {
line: '/foo/gimsuy', line: '/foo/dgimsuy',
tokens: [ tokens: [
{ startIndex: 0, type: 'regexp.ts' }, { startIndex: 0, type: 'regexp.ts' },
{ startIndex: 5, type: 'keyword.other.ts' } { startIndex: 5, type: 'keyword.other.ts' }

@ -240,7 +240,7 @@ export const language = {
// regular expression: ensure it is terminated before beginning (otherwise it is an opeator) // regular expression: ensure it is terminated before beginning (otherwise it is an opeator)
[ [
/\/(?=([^\\\/]|\\.)+\/([gimsuy]*)(\s*)(\.|;|,|\)|\]|\}|$))/, /\/(?=([^\\\/]|\\.)+\/([dgimsuy]*)(\s*)(\.|;|,|\)|\]|\}|$))/,
{ token: 'regexp', bracket: '@open', next: '@regexp' } { token: 'regexp', bracket: '@open', next: '@regexp' }
], ],
@ -313,7 +313,7 @@ export const language = {
[/@regexpesc/, 'regexp.escape'], [/@regexpesc/, 'regexp.escape'],
[/\\\./, 'regexp.invalid'], [/\\\./, 'regexp.invalid'],
[ [
/(\/)([gimsuy]*)/, /(\/)([dgimsuy]*)/,
[{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other'] [{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']
] ]
], ],

Loading…
Cancel
Save