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

Emit delimiters near html tags

Browse source
This commit is contained in:
Alex Dima 2016-09-16 18:22:38 +02:00
parent f1f3088632
commit 5e08803177
1 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/html.ts
View file

@ -52,6 +52,15 @@ export var conf:IRichLanguageConfiguration = {
], ],
}; };
export const htmlTokenTypes = {
DELIM_START: 'start.delimiter.tag',
DELIM_END: 'end.delimiter.tag',
DELIM_COMMENT: 'comment',
getTag: (name: string) => {
return 'tag';
}
};
export var language = <ILanguage> { export var language = <ILanguage> {
defaultToken: '', defaultToken: '',
tokenPostfix: '.html', tokenPostfix: '.html',
@ -61,11 +70,11 @@ export var language = <ILanguage> {
root: [ root: [
[/<!DOCTYPE/, 'metatag', '@doctype'], [/<!DOCTYPE/, 'metatag', '@doctype'],
[/<!--/, 'comment', '@comment'], [/<!--/, 'comment', '@comment'],
[/<\w+\/>/, 'tag'], [/(<)(\w+)(\/>)/, [htmlTokenTypes.DELIM_START, 'tag', htmlTokenTypes.DELIM_END]],
[/<script/, 'tag', '@script'], [/(<)(script)/, [htmlTokenTypes.DELIM_START, { token: 'tag', next: '@script'} ]],
[/<style/, 'tag', '@style'], [/(<)(style)/, [htmlTokenTypes.DELIM_START, { token: 'tag', next: '@style'} ]],
[/<\w+/, 'tag', '@otherTag'], [/(<)(\w+)/, [htmlTokenTypes.DELIM_START, { token: 'tag', next: '@otherTag'} ]],
[/<\/\w+/, 'tag', '@otherTag'], [/(<\/)(\w+)/, [htmlTokenTypes.DELIM_START, { token: 'tag', next: '@otherTag' }]],
[/[^<]+/] // text [/[^<]+/] // text
], ],
@ -81,7 +90,7 @@ export var language = <ILanguage> {
], ],
otherTag: [ otherTag: [
[/\/?>/, 'tag', '@pop'], [/\/?>/, htmlTokenTypes.DELIM_END, '@pop'],
[/"([^"]*)"/, 'attribute.value'], [/"([^"]*)"/, 'attribute.value'],
[/'([^']*)'/, 'attribute.value'], [/'([^']*)'/, 'attribute.value'],
[/[\w\-]+/, 'attribute.name'], [/[\w\-]+/, 'attribute.name'],
@ -98,9 +107,9 @@ export var language = <ILanguage> {
[/'([^']*)'/, 'attribute.value'], [/'([^']*)'/, 'attribute.value'],
[/[\w\-]+/, 'attribute.name'], [/[\w\-]+/, 'attribute.name'],
[/=/, 'delimiter'], [/=/, 'delimiter'],
[/>/, { token: 'tag', next: '@scriptEmbedded', nextEmbedded: 'text/javascript'} ], [/>/, { token: htmlTokenTypes.DELIM_END, next: '@scriptEmbedded', nextEmbedded: 'text/javascript'} ],
[/[ \t\r\n]+/], // whitespace [/[ \t\r\n]+/], // whitespace
[/<\/script\s*>/, 'tag', '@pop'] [/(<\/)(script\s*)(>)/, [ htmlTokenTypes.DELIM_START, 'tag', { token: htmlTokenTypes.DELIM_END, next: '@pop' } ]]
], ],
// After <script ... type // After <script ... type
@ -120,7 +129,7 @@ export var language = <ILanguage> {
// After <script ... type = $S2 // After <script ... type = $S2
scriptWithCustomType: [ scriptWithCustomType: [
[/>/, { token: 'tag', next: '@scriptEmbedded', nextEmbedded: '$S2'}], [/>/, { token: htmlTokenTypes.DELIM_END, next: '@scriptEmbedded.$S2', nextEmbedded: '$S2'}],
[/[ \t\r\n]+/], // whitespace [/[ \t\r\n]+/], // whitespace
[/<\/script\s*>/, { token: '@rematch', next: '@pop' }] [/<\/script\s*>/, { token: '@rematch', next: '@pop' }]
], ],
@ -141,9 +150,9 @@ export var language = <ILanguage> {
[/'([^']*)'/, 'attribute.value'], [/'([^']*)'/, 'attribute.value'],
[/[\w\-]+/, 'attribute.name'], [/[\w\-]+/, 'attribute.name'],
[/=/, 'delimiter'], [/=/, 'delimiter'],
[/>/, { token: 'tag', next: '@styleEmbedded', nextEmbedded: 'text/css'} ], [/>/, { token: htmlTokenTypes.DELIM_END, next: '@styleEmbedded', nextEmbedded: 'text/css'} ],
[/[ \t\r\n]+/], // whitespace [/[ \t\r\n]+/], // whitespace
[/<\/style\s*>/, 'tag', '@pop'] [/(<\/)(style\s*)(>)/, [htmlTokenTypes.DELIM_START, 'tag', { token: htmlTokenTypes.DELIM_END, next: '@pop' } ]]
], ],
// After <style ... type // After <style ... type
@ -163,7 +172,7 @@ export var language = <ILanguage> {
// After <style ... type = $S2 // After <style ... type = $S2
styleWithCustomType: [ styleWithCustomType: [
[/>/, { token: 'tag', next: '@styleEmbedded', nextEmbedded: '$S2'}], [/>/, { token: htmlTokenTypes.DELIM_END, next: '@styleEmbedded.$S2', nextEmbedded: '$S2'}],
[/[ \t\r\n]+/], // whitespace [/[ \t\r\n]+/], // whitespace
[/<\/style\s*>/, { token: '@rematch', next: '@pop' }] [/<\/style\s*>/, { token: '@rematch', next: '@pop' }]
], ],