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

adopt latest editor

Browse source
This commit is contained in:
Alex Dima 2016-12-31 00:13:50 +02:00
parent b5b35011ef
commit 21953fde00
2 changed files with 30 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/markdown.ts
View file

@ -75,33 +75,28 @@ export var language = <ILanguage>{
[/^(\t|[ ]{4})[^ ].*$/, TOKEN_BLOCK],
// code block (3 tilde)
[/^\s*~{3}\s*((?:\w|[\/\-#])+)?\s*$/, { token: TOKEN_BLOCK, next: '@codeblock' }],
[/^\s*~~~\s*((?:\w|[\/\-#])+)?\s*$/, { token: TOKEN_BLOCK, next: '@codeblock' }],
// github style code blocks (with backticks and language)
[/^\s*```\s*((?:\w|[\/\-#])+)\s*$/, { token: TOKEN_BLOCK, next: '@codeblockgh', nextEmbedded: '$1' }],
// github style code blocks (with backticks but no language)
[/^\s*`{3}\s*$/, { token: TOKEN_BLOCK, next: '@codeblock' }],
[/^\s*```\s*$/, { token: TOKEN_BLOCK, next: '@codeblock' }],
// markup within lines
{ include: '@linecontent' },
],
codeblock: [
[/^\s*~{3}\s*$/, { token: TOKEN_BLOCK, next: '@pop' }],
[/^\s*`{3}\s*$/, { token: TOKEN_BLOCK, next: '@pop' }],
[/^\s*~~~\s*$/, { token: TOKEN_BLOCK, next: '@pop' }],
[/^\s*```\s*$/, { token: TOKEN_BLOCK, next: '@pop' }],
[/.*$/, TOKEN_BLOCK_CODE],
],
// github style code blocks
codeblockgh: [
[/```\s*$/, { token: '@rematch', switchTo: '@codeblockghend', nextEmbedded: '@pop' }],
[/[^`]*$/, TOKEN_BLOCK_CODE],
],
codeblockghend: [
[/\s*```/, { token: TOKEN_BLOCK_CODE, next: '@pop' }],
[/./, '@rematch', '@pop'],
[/```\s*$/, { token: TOKEN_BLOCK_CODE, next: '@pop', nextEmbedded: '@pop' }],
[/[^`]+/, TOKEN_BLOCK_CODE],
],
linecontent: [
@ -166,11 +161,11 @@ export var language = <ILanguage>{
[/\/>/, getTag('$S2'), '@pop'],
[/>/, {
cases: {
'$S2==style': { token: getTag('$S2'), switchTo: '@embedded.$S2', nextEmbedded: 'text/css' },
'$S2==style': { token: getTag('$S2'), switchTo: 'embeddedStyle', nextEmbedded: 'text/css' },
'$S2==script': {
cases: {
'$S3': { token: getTag('$S2'), switchTo: '@embedded.$S2', nextEmbedded: '$S3' },
'@default': { token: getTag('$S2'), switchTo: '@embedded.$S2', nextEmbedded: 'text/javascript' }
'$S3': { token: getTag('$S2'), switchTo: 'embeddedScript', nextEmbedded: '$S3' },
'@default': { token: getTag('$S2'), switchTo: 'embeddedScript', nextEmbedded: 'text/javascript' }
}
},
'@default': { token: getTag('$S2'), next: '@pop' }
@ -178,32 +173,16 @@ export var language = <ILanguage>{
}],
],
embedded: [
[/[^"'<]+/, ''],
[/<\/(\w+)\s*>/, {
cases: {
'$1==$S2': { token: '@rematch', next: '@pop', nextEmbedded: '@pop' },
'@default': ''
}
}],
[/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
[/'([^'\\]|\\.)*$/, 'string.invalid'], // non-teminated string
[/"/, 'string', '@string."'],
[/'/, 'string', '@string.\''],
embeddedStyle: [
[/[^<]+/, ''],
[/<\/style\s*>/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
[/</, '']
],
// scan embedded strings in javascript or css
string: [
[/[^\\"']+/, 'string'],
[/@jsescapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/["']/, {
cases: {
'$#==$S2': { token: 'string', next: '@pop' },
'@default': 'string'
}
}]
]
embeddedScript: [
[/[^<]+/, ''],
[/<\/script\s*>/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
[/</, '']
],
}
};