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

Fixes Microsoft/monaco-editor#1175

Browse source
This commit is contained in:
Alex Dima 2018-11-12 14:01:28 +01:00
parent 9961f06110
commit ad77f86a8c
2 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/shell/shell.test.ts
View file

@ -279,4 +279,13 @@ testTokenization('shell', [
{ startIndex: 4, type: 'string.heredoc.shell' } { startIndex: 4, type: 'string.heredoc.shell' }
] ]
}], }],
[{
line: 'echo $( echo "hi" )',
tokens: [
{ startIndex: 0, type: 'type.identifier.shell' },
{ startIndex: 4, type: 'white.shell' },
{ startIndex: 5, type: 'variable.shell' }
]
}],
]) ])

27
src/shell/shell.ts
View file

@ -201,13 +201,30 @@ export const language = <ILanguage>{
[/\$\d+/, 'variable.predefined'], [/\$\d+/, 'variable.predefined'],
[/\$\w+/, 'variable'], [/\$\w+/, 'variable'],
[/\$[*@#?\-$!0_]/, 'variable'], [/\$[*@#?\-$!0_]/, 'variable'],
[/\$['"{(]/, 'variable', '@parameterBody'] [/\$'/, 'variable', '@parameterBodyQuote'],
[/\$"/, 'variable', '@parameterBodyDoubleQuote'],
[/\$\(/, 'variable', '@parameterBodyParen'],
[/\$\{/, 'variable', '@parameterBodyCurlyBrace'],
], ],
parameterBodyQuote: [
parameterBody: [ [/[^#:%*@\-!_']+/, 'variable'],
[/[#:%*@\-!_]/, 'delimiter'], [/[#:%*@\-!_]/, 'delimiter'],
[/['"{(]/, 'variable', '@pop'], [/[']/, 'variable', '@pop'],
[/./, 'variable'] ],
parameterBodyDoubleQuote: [
[/[^#:%*@\-!_"]+/, 'variable'],
[/[#:%*@\-!_]/, 'delimiter'],
[/["]/, 'variable', '@pop'],
],
parameterBodyParen: [
[/[^#:%*@\-!_)]+/, 'variable'],
[/[#:%*@\-!_]/, 'delimiter'],
[/[)]/, 'variable', '@pop'],
],
parameterBodyCurlyBrace: [
[/[^#:%*@\-!_}]+/, 'variable'],
[/[#:%*@\-!_]/, 'delimiter'],
[/[}]/, 'variable', '@pop'],
], ],
} }
}; };