github-forks
/
monaco-editor
mirror of https://github.com/microsoft/monaco-editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update with more JSX fixes.

Browse Source
pull/4650/head
The Software Philosopher 5 months ago committed by GitHub
parent 15e3e5b806
commit 9f902e753e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 264 additions and 373 deletions
Show Stats Download Patch File Download Diff File

637
src/basic-languages/typescript/typescript.ts
Unescape Escape View File

@ -75,134 +75,47 @@ export const conf: languages.LanguageConfiguration = {
};
export const language = {
defaultToken: 'invalid',
tokenPostfix: '.ts',
typeKeywords: ['any', 'bigint', 'boolean', 'number', 'object', 'string', 'unknown', 'void'],
typeKeywords: [
'any', 'bigint', 'boolean', 'number', 'object', 'string', 'unknown', 'void',
],
ctrlKeywords: [
'export',
'default',
'return',
'as',
'if',
'break',
'case',
'catch',
'continue',
'do',
'else',
'finally',
'for',
'throw',
'try',
'with',
'yield',
'await',
'import',
'from',
'type'
'export', 'default', 'return', 'as', 'if', 'break', 'case', 'catch', 'continue',
'do', 'else', 'finally', 'for', 'throw', 'try', 'with', 'yield', 'await',
'import', 'from', 'type',
],
alwaysKeyword: ['constructor', 'super'],
alwaysKeyword: [
'constructor', 'super',
],
keywords: [
// Should match the keys of textToKeywordObj in
// https://github.com/microsoft/TypeScript/blob/master/src/compiler/scanner.ts
'abstract',
'asserts',
'class',
'const',
'debugger',
'declare',
'delete',
'enum',
'extends',
'false',
'function',
'get',
'implements',
'in',
'infer',
'instanceof',
'interface',
'is',
'keyof',
'let',
'module',
'namespace',
'never',
'new',
'null',
'out',
'package',
'private',
'protected',
'public',
'override',
'readonly',
'require',
'global',
'satisfies',
'set',
'static',
'switch',
'symbol',
'this',
'true',
'typeof',
'undefined',
'unique',
'var',
'while',
'async',
'of'
// Should match the keys of textToKeywordObj in
// https://github.com/microsoft/TypeScript/blob/master/src/compiler/scanner.ts
'abstract', 'asserts',
'class', 'const', 'debugger',
'declare', 'delete', 'enum',
'extends', 'false', 'function', 'get',
'implements', 'in', 'infer', 'instanceof', 'interface',
'is', 'keyof', 'let', 'module', 'namespace', 'never', 'new',
'null', 'out', 'package', 'private', 'protected',
'public', 'override', 'readonly', 'require', 'global', 'satisfies',
'set', 'static', 'switch', 'symbol', 'this',
'true', 'typeof', 'undefined', 'unique',
'var', 'while', 'async', 'of'
],
operators: [
'<=',
'>=',
'==',
'!=',
'===',
'!==',
'=>',
'+',
'-',
'**',
'*',
'/',
'%',
'++',
'--',
'<<',
'</',
'>>',
'>>>',
'&',
'|',
'^',
'!',
'~',
'&&',
'||',
'??',
'?',
':',
'=',
'+=',
'-=',
'*=',
'**=',
'/=',
'%=',
'<<=',
'>>=',
'>>>=',
'&=',
'|=',
'^=',
'@'
'<=', '>=', '==', '!=', '===', '!==', '=>',
'+', '-', '**', '*', '/', '%', '++',
'--', '<<', '</', '>>', '>>>', '&', '|',
'^', '!', '~', '&&', '||', '??', '?',
':', '=', '+=', '-=', '*=', '**=', '/=',
'%=', '<<=', '>>=', '>>>=', '&=', '|=', '^=', '@'
],
// we include these common regular expressions
@ -218,271 +131,249 @@ export const language = {
// The main tokenizer for our languages
tokenizer: {
root: [
[
/}/,
{
cases: {
'$S2==INJSX': { token: '@brackets', next: '@pop' },
'@default': '@brackets'
}
}
],
[/{/, 'delimiter.bracket'],
// highlight class field-properties
[/^\s+#?[\w$]+(?=\s*[;=:])/, 'variable.property'],
// highlight function/class defs
[
/(function|class|new)(\s+)(#?[\w$]+)(\s*)([<(]?)/,
[
'keyword',
'',
{
cases: {
'$1==function': 'method',
'$1==class': 'type.identifier',
'$1==new': 'type.identifier'
}
},
'',
{
cases: {
'<': { token: '@brackets', next: '@typeparams' },
'@default': '@rematch'
}
}
]
],
// highlight var/const/let defs
[
/(const|let|var)(\s+)(#?[\w$]+)/,
[
'keyword',
'',
{
cases: {
'$1==const': 'constant',
'@default': 'variable'
}
}
]
],
{ include: 'jsxReady' },
{ include: 'common' }
],
common: [
// identifiers and keywords
[
/(#?[a-zA-Z_$][\w$]*)([<(]?)/,
[
{
cases: {
'@typeKeywords': 'type.identifier',
'@alwaysKeyword': 'keyword',
'$1~#?[A-Z].*': 'type.identifier',
$2: 'method',
'@ctrlKeywords': 'keyword.flow',
'@keywords': 'keyword',
'@default': 'identifier'
}
},
{
cases: {
'$2==<': { token: '@brackets', next: '@typeparams' },
'@default': '@rematch'
}
}
]
],
// whitespace
{ include: '@whitespace' },
// regular expression: ensure it is terminated before beginning (otherwise it is an opeator)
[
/\/(?=([^\\\/]|\\.)+\/([dgimsuy]*)(\s*)(\.|;|,|\)|\]|\}|$))/,
{ token: 'regexp', bracket: '@open', next: '@regexp' }
],
// delimiters and operators
[/[()\[\]]/, '@brackets'],
[/[<>](?!@symbols)/, '@brackets'],
[/!(?=([^=]|$))/, 'delimiter'],
[
/@symbols/,
{
cases: {
'@operators': 'delimiter',
'@default': ''
}
}
],
[/\.\.\./, 'keyword'],
// numbers
[/(@digits)[eE]([\-+]?(@digits))?/, 'number.float'],
[/(@digits)\.(@digits)([eE][\-+]?(@digits))?/, 'number.float'],
[/0[xX](@hexdigits)n?/, 'number.hex'],
[/0[oO]?(@octaldigits)n?/, 'number.octal'],
[/0[bB](@binarydigits)n?/, 'number.binary'],
[/(@digits)n?/, 'number'],
// delimiter: after number because of .\d floats
[/[;,.]/, 'delimiter'],
// strings
[/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
[/'([^'\\]|\\.)*$/, 'string.invalid'], // non-teminated string
[/"/, 'string', '@string_double'],
[/'/, 'string', '@string_single'],
[/`/, 'string', '@string_backtick']
],
typeparams: [[/>/, '@brackets', '@pop'], { include: 'common' }],
jsxReady: [
[/<>/, 'delimiter.html', '@jsxText.FRAGMENT'],
[
/(<)([A-Z][\w$]*\s*(?:,|extends|implements))/,
['@brackets', { token: '@rematch', next: '@typeparams' }]
],
[/(<)(\s*)([\w$])/, ['delimiter.html', '', { token: '@rematch', next: '@jsxIdent.jsxOpen.' }]]
],
jsxIdent: [
[/\./, { token: 'delimiter', switchTo: '$S0^' }],
[/[A-Z][\w$]*/, { token: 'type.identifier', switchTo: '$S0$0' }],
[/[\w$]+/, { token: 'tag', switchTo: '$S0$0' }],
[/.+/, { token: '@rematch', switchTo: '@$S2.$S3.$S4' }]
],
jsxOpen: [
[/>/, { token: 'delimiter.html', switchTo: '@jsxText.$S2' }],
[/\/>/, { token: 'delimiter.html', next: '@pop' }],
[/ +([\w-$]+)/, 'attribute.name'],
[/(=)(')/, ['delimiter', { token: 'string', next: '@string_single' }]],
[/(=)(")/, ['delimiter', { token: 'string', next: '@string_double' }]],
[/(=)({)/, ['delimiter', { token: '@brackets', next: '@root.INJSX' }]]
],
jsxText: [
[/{/, { token: 'keyword', next: '@root.INJSX', bracket: '@open' }],
[
/<\/>/,
{
cases: {
'$S2==FRAGMENT': { token: 'delimiter.html', next: '@pop' },
'@default': { token: 'invalid', next: '@pop' }
}
}
],
[
/(<\/)(\s*)([\w$])/,
['delimiter.html', '', { token: '@rematch', switchTo: '@jsxIdent.jsxClose.$S2.' }]
],
{ include: 'jsxReady' },
[/./, 'string']
],
jsxClose: [
[
/>/,
{
cases: {
'$S2==$S3': { token: 'delimiter.html', next: '@pop' },
'@default': { token: 'invalid', next: '@pop' }
}
}
]
],
whitespace: [
[/[ \t\r\n]+/, ''],
[/\/\*\*(?!\/)/, 'comment.doc', '@jsdoc'],
[/\/\*/, 'comment', '@comment'],
[/\/\/.*$/, 'comment']
],
comment: [
[/[^\/*]+/, 'comment'],
[/\*\//, 'comment', '@pop'],
[/[\/*]/, 'comment']
],
jsdoc: [
[/[^\/*]+/, 'comment.doc'],
[/\*\//, 'comment.doc', '@pop'],
[/[\/*]/, 'comment.doc']
],
root: [
[/}/, {
cases: {
'$S2==INJSX': { token: '@brackets', next: '@pop' },
'@default': '@brackets',
}
}],
[/{/, 'delimiter.bracket'],
// highlight class field-properties
[/^\s+#?[\w$]+(?=\s*[;=:])/, 'variable.property'],
// highlight function/class defs
[/(function|class|new)(\s+)(#?[\w$]+)(\s*)([<(]?)/, ['keyword', '',
{
cases: {
'$1==function': 'method',
'$1==class': 'type.identifier',
'$1==new': 'type.identifier',
}
}, '', {
cases: {
'<': { token: '@brackets', next: '@typeparams' },
'@default': '@rematch',
}
},
]],
// highlight var/const/let defs
[/(const|let|var)(\s+)(#?[\w$]+)/, ['keyword', '', {
cases: {
'$1==const': 'constant',
'@default': 'variable',
}
}]],
{ include: 'jsxReady' },
{ include: 'common' },
],
common: [
// identifiers and keywords
[/(#?[a-zA-Z_$][\w$]*)([<(]?)/, [
{
cases: {
'@typeKeywords': 'type.identifier',
'@alwaysKeyword': 'keyword',
'$1~#?[A-Z].*': 'type.identifier',
'$2': 'method',
'@ctrlKeywords': 'keyword.flow',
'@keywords': 'keyword',
'@default': 'identifier',
}
},
{
cases: {
'$2==<': { token: '@brackets', next: '@typeparams' },
'@default': '@rematch',
}
},
]],
// We match regular expression quite precisely
regexp: [
[
/(\{)(\d+(?:,\d*)?)(\})/,
['regexp.escape.control', 'regexp.escape.control', 'regexp.escape.control']
],
[
/(\[)(\^?)(?=(?:[^\]\\\/]|\\.)+)/,
['regexp.escape.control', { token: 'regexp.escape.control', next: '@regexrange' }]
],
[/(\()(\?:|\?=|\?!)/, ['regexp.escape.control', 'regexp.escape.control']],
[/[()]/, 'regexp.escape.control'],
[/@regexpctl/, 'regexp.escape.control'],
[/[^\\\/]/, 'regexp'],
[/@regexpesc/, 'regexp.escape'],
[/\\\./, 'regexp.invalid'],
[/(\/)([dgimsuy]*)/, [{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']]
],
// whitespace
{ include: '@whitespace' },
regexrange: [
[/-/, 'regexp.escape.control'],
[/\^/, 'regexp.invalid'],
[/@regexpesc/, 'regexp.escape'],
[/[^\]]/, 'regexp'],
[
/\]/,
{
token: 'regexp.escape.control',
next: '@pop',
bracket: '@close'
}
]
// regular expression: ensure it is terminated before beginning (otherwise it is an opeator)
[
/\/(?=([^\\\/]|\\.)+\/([dgimsuy]*)(\s*)(\.|;|,|\)|\]|\}|$))/,
{ token: 'regexp', bracket: '@open', next: '@regexp' }
],
string_double: [
[/[^\\"]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/"/, 'string', '@pop']
// delimiters and operators
[/[()\[\]]/, '@brackets'],
[/[<>](?!@symbols)/, '@brackets'],
[/!(?=([^=]|$))/, 'delimiter'],
[
/@symbols/,
{
cases: {
'@operators': 'delimiter',
'@default': ''
}
}
],
string_single: [
[/[^\\']+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/'/, 'string', '@pop']
[/\.\.\./, 'keyword'],
// numbers
[/(@digits)[eE]([\-+]?(@digits))?/, 'number.float'],
[/(@digits)\.(@digits)([eE][\-+]?(@digits))?/, 'number.float'],
[/0[xX](@hexdigits)n?/, 'number.hex'],
[/0[oO]?(@octaldigits)n?/, 'number.octal'],
[/0[bB](@binarydigits)n?/, 'number.binary'],
[/(@digits)n?/, 'number'],
// delimiter: after number because of .\d floats
[/[;,.]/, 'delimiter'],
// strings
[/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
[/'([^'\\]|\\.)*$/, 'string.invalid'], // non-teminated string
[/"/, 'string', '@string_double'],
[/'/, 'string', '@string_single'],
[/`/, 'string', '@string_backtick']
],
typeparams: [
[/>/, '@brackets', '@pop'],
{ include: 'common' }
],
jsxReady: [
[/<>/, 'delimiter.html', '@jsxText.FRAGMENT'],
[/(<)([A-Z][\w$]*\s*(?:,|extends|implements))/, ['@brackets', { token: '@rematch', next: '@typeparams' }]],
[/(<)(\s*)([\w$])/, ['delimiter.html', '',
{ token: '@rematch', next: '@jsxIdent.jsxOpen.' },
]],
],
jsxIdent: [
[/\./, { token: 'delimiter', switchTo: '$S0^' }],
[/[A-Z][\w$]*/, { token: 'type.identifier', switchTo: '$S0$0' }],
[/[\w$-]+/, { token: 'tag', switchTo: '$S0$0' }],
[/.+/, { token: '@rematch', switchTo: '@$S2.$S3.$S4' }],
],
jsxOpen: [
[/{/, { token: 'keyword', next: '@root.INJSX', bracket: '@open' }],
[/>/, { token: 'delimiter.html', switchTo: '@jsxText.$S2' }],
[/\/>/, { token: 'delimiter.html', next: '@pop' }],
[/ +([\w-$]+)/, 'attribute.name'],
[/(=)(')/, ['delimiter', { token: 'string', next: '@string_single' }]],
[/(=)(")/, ['delimiter', { token: 'string', next: '@string_double' }]],
[/(=)({)/, ['delimiter', { token: '@brackets', next: '@root.INJSX' }]],
],
jsxText: [
[/{/, { token: 'keyword', next: '@root.INJSX', bracket: '@open' }],
[/<\/>/, {
cases: {
'$S2==FRAGMENT': { token: 'delimiter.html', next: '@pop' },
'@default': { token: 'invalid', next: '@pop' },
}
}],
[/(<\/)(\s*)([\w$])/, ['delimiter.html', '',
{ token: '@rematch', switchTo: '@jsxIdent.jsxClose.$S2.' },
]],
{ include: 'jsxReady' },
[/./, 'string'],
],
jsxClose: [
[/>/, {
cases: {
'$S2==$S3': { token: 'delimiter.html', next: '@pop' },
'@default': { token: 'invalid', next: '@pop' },
}
}],
],
whitespace: [
[/[ \t\r\n]+/, ''],
[/\/\*\*(?!\/)/, 'comment.doc', '@jsdoc'],
[/\/\*/, 'comment', '@comment'],
[/\/\/.*$/, 'comment']
],
comment: [
[/[^\/*]+/, 'comment'],
[/\*\//, 'comment', '@pop'],
[/[\/*]/, 'comment']
],
jsdoc: [
[/[^\/*]+/, 'comment.doc'],
[/\*\//, 'comment.doc', '@pop'],
[/[\/*]/, 'comment.doc']
],
// We match regular expression quite precisely
regexp: [
[
/(\{)(\d+(?:,\d*)?)(\})/,
['regexp.escape.control', 'regexp.escape.control', 'regexp.escape.control']
],
string_backtick: [
[/\$\{/, { token: 'delimiter.bracket', next: '@bracketCounting' }],
[/[^\\`$]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/`/, 'string', '@pop']
[
/(\[)(\^?)(?=(?:[^\]\\\/]|\\.)+)/,
['regexp.escape.control', { token: 'regexp.escape.control', next: '@regexrange' }]
],
bracketCounting: [
[/\{/, 'delimiter.bracket', '@bracketCounting'],
[/\}/, 'delimiter.bracket', '@pop'],
{ include: 'common' }
[/(\()(\?:|\?=|\?!)/, ['regexp.escape.control', 'regexp.escape.control']],
[/[()]/, 'regexp.escape.control'],
[/@regexpctl/, 'regexp.escape.control'],
[/[^\\\/]/, 'regexp'],
[/@regexpesc/, 'regexp.escape'],
[/\\\./, 'regexp.invalid'],
[/(\/)([dgimsuy]*)/, [{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']]
],
regexrange: [
[/-/, 'regexp.escape.control'],
[/\^/, 'regexp.invalid'],
[/@regexpesc/, 'regexp.escape'],
[/[^\]]/, 'regexp'],
[
/\]/,
{
token: 'regexp.escape.control',
next: '@pop',
bracket: '@close'
}
]
],
string_double: [
[/[^\\"]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/"/, 'string', '@pop']
],
string_single: [
[/[^\\']+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/'/, 'string', '@pop']
],
string_backtick: [
[/\$\{/, { token: 'delimiter.bracket', next: '@bracketCounting' }],
[/[^\\`$]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/`/, 'string', '@pop']
],
bracketCounting: [
[/\{/, 'delimiter.bracket', '@bracketCounting'],
[/\}/, 'delimiter.bracket', '@pop'],
{ include: 'common' }
]
}
};

Write Preview
Loading…
Cancel
Save