Small tweaks

This commit is contained in:
Alex Dima 2016-12-31 00:46:15 +02:00
parent 36b879e624
commit da418eb8d9
3 changed files with 6 additions and 6 deletions

View file

@ -282,16 +282,12 @@ export var language = <ILanguage> {
comment: [ comment: [
[/[^\/*]+/, 'comment' ], [/[^\/*]+/, 'comment' ],
// [/\/\*/, 'comment', '@push' ], // nested comment not allowed :-(
// [/\/\*/, 'comment.invalid' ], // this breaks block comments in the shape of /* //*/
[/\*\//, 'comment', '@pop' ], [/\*\//, 'comment', '@pop' ],
[/[\/*]/, 'comment' ] [/[\/*]/, 'comment' ]
], ],
//Identical copy of comment above, except for the addition of .doc //Identical copy of comment above, except for the addition of .doc
doccomment: [ doccomment: [
[/[^\/*]+/, 'comment.doc' ], [/[^\/*]+/, 'comment.doc' ],
// [/\/\*/, 'comment.doc', '@push' ], // nested comment not allowed :-(
[/\/\*/, 'comment.doc.invalid' ],
[/\*\//, 'comment.doc', '@pop' ], [/\*\//, 'comment.doc', '@pop' ],
[/[\/*]/, 'comment.doc' ] [/[\/*]/, 'comment.doc' ]
], ],

View file

@ -184,12 +184,14 @@ export var language = <IMonarchLanguage> {
stringenddoublequote: [ stringenddoublequote: [
['\\\\.', 'string'], ['\\\\.', 'string'],
['"', { token: 'string', next: '@pop' }], ['"', { token: 'string', next: '@pop' }],
[/[^\\"]+/, 'string'],
['.', 'string'] ['.', 'string']
], ],
stringendquote: [ stringendquote: [
['\\\\.', 'string'], ['\\\\.', 'string'],
['\'', { token: 'string', next: '@pop' }], ['\'', { token: 'string', next: '@pop' }],
[/[^\\']+/, 'string'],
['.', 'string'] ['.', 'string']
] ]
} }

View file

@ -144,7 +144,8 @@ export var language = <ILanguage> {
], ],
scriptEmbedded: [ scriptEmbedded: [
[/<\/script/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }] [/<\/script/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
[/[^<]+/, '']
], ],
// -- END <script> tags handling // -- END <script> tags handling
@ -191,7 +192,8 @@ export var language = <ILanguage> {
], ],
styleEmbedded: [ styleEmbedded: [
[/<\/style/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }] [/<\/style/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
[/[^<]+/, '']
], ],
// -- END <style> tags handling // -- END <style> tags handling