SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 22:02:55 +01:00
Code Issues Projects Releases Packages Activity

Merge pull request #46 from spahnke/regex-flags

Browse source 
Improve tokenization of regular expressions
This commit is contained in:
Peng Lyu 2018-10-01 15:46:21 -07:00 • committed by GitHub
commit 66b5497f3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/javascript/javascript.test.ts
View file

@ -446,6 +446,39 @@ testTokenization('javascript', [
]
}],
[{
line: '/foo/',
tokens: [
{ startIndex: 0, type: 'regexp.js' }
]
}],
[{
line: '/foo/g',
tokens: [
{ startIndex: 0, type: 'regexp.js' },
{ startIndex: 5, type: 'keyword.other.js' }
]
}],
[{
line: '/foo/gimsuy',
tokens: [
{ startIndex: 0, type: 'regexp.js' },
{ startIndex: 5, type: 'keyword.other.js' }
]
}],
[{
line: '/foo/q', // invalid flag
tokens: [
{ startIndex: 0, type: 'delimiter.js' },
{ startIndex: 1, type: 'identifier.js' },
{ startIndex: 4, type: 'delimiter.js' },
{ startIndex: 5, type: 'identifier.js' }
]
}],
[{
line: 'x = 1 + f(2 / 3, /foo/)',
tokens: [

33
src/typescript/typescript.test.ts
View file

@ -446,6 +446,39 @@ testTokenization('typescript', [
]
}],
[{
line: '/foo/',
tokens: [
{ startIndex: 0, type: 'regexp.ts' }
]
}],
[{
line: '/foo/g',
tokens: [
{ startIndex: 0, type: 'regexp.ts' },
{ startIndex: 5, type: 'keyword.other.ts' }
]
}],
[{
line: '/foo/gimsuy',
tokens: [
{ startIndex: 0, type: 'regexp.ts' },
{ startIndex: 5, type: 'keyword.other.ts' }
]
}],
[{
line: '/foo/q', // invalid flag
tokens: [
{ startIndex: 0, type: 'delimiter.ts' },
{ startIndex: 1, type: 'identifier.ts' },
{ startIndex: 4, type: 'delimiter.ts' },
{ startIndex: 5, type: 'identifier.ts' }
]
}],
[{
line: 'x = 1 + f(2 / 3, /foo/)',
tokens: [

4
src/typescript/typescript.ts
View file

@ -130,7 +130,7 @@ export const language = {
{ include: '@whitespace' },
// regular expression: ensure it is terminated before beginning (otherwise it is an opeator)
[/\/(?=([^\\\/]|\\.)+\/([gimuy]*)(\s*)(\.|;|\/|,|\)|\]|\}|$))/, { token: 'regexp', bracket: '@open', next: '@regexp' }],
[/\/(?=([^\\\/]|\\.)+\/([gimsuy]*)(\s*)(\.|;|\/|,|\)|\]|\}|$))/, { token: 'regexp', bracket: '@open', next: '@regexp' }],
// delimiters and operators
[/[()\[\]]/, '@brackets'],
@ -190,7 +190,7 @@ export const language = {
[/[^\\\/]/, 'regexp'],
[/@regexpesc/, 'regexp.escape'],
[/\\\./, 'regexp.invalid'],
['/', { token: 'regexp', bracket: '@close' }, '@pop'],
[/(\/)([gimsuy]*)/, [{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']],
],
regexrange: [