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

Fixed failing tests due to regexp modifiers being handled differently

Browse source
This commit is contained in:
Matthew D. Miller 2018-10-10 14:16:45 -05:00
parent 40fdb5d594
commit 3928208ab4
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/perl/perl.test.ts
View file

@ -310,14 +310,23 @@ testTokenization('perl', [
[ [
{ {
line: 'm/abc/', line: 'm/abc/',
tokens: [{ startIndex: 0, type: 'regexp.perl' }], tokens: [
{ startIndex: 0, type: 'regexp.delim.perl' },
{ startIndex: 2, type: 'regexp.perl' },
{ startIndex: 5, type: 'regexp.delim.perl' },
],
}, },
], ],
[ [
{ {
line: 'm/[abc]+/e', line: 'm/[abc]+/e',
tokens: [{ startIndex: 0, type: 'regexp.perl' }], tokens: [
{ startIndex: 0, type: 'regexp.delim.perl' },
{ startIndex: 2, type: 'regexp.perl' },
{ startIndex: 8, type: 'regexp.delim.perl' },
{ startIndex: 9, type: 'regexp.modifier.perl' },
],
}, },
], ],

6
src/perl/perl.ts
View file

@ -601,13 +601,17 @@ export const language = <ILanguage>{
[/\\./, 'regexp.escape'], [/\\./, 'regexp.escape'],
[/./, { [/./, {
cases: { cases: {
'$#==$S3': { token: 'regexp.delim', next: '@pop' }, '$#==$S3': { token: 'regexp.delim', next: '@regexpModifiers' },
'$#==$S2': { token: 'regexp.delim', next: '@push' }, // nested delimiters '$#==$S2': { token: 'regexp.delim', next: '@push' }, // nested delimiters
'@default': 'regexp' '@default': 'regexp'
} }
}], }],
], ],
regexpModifiers: [
[/[msixpodualngcer]+/, { token: 'regexp.modifier', next: '@popall' }],
],
// Expanded quoted string // Expanded quoted string
// qqstring.<open>.<close> // qqstring.<open>.<close>
// open = open delimiter // open = open delimiter