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

Fixes microsoft/monaco-editor#1935

Browse source
This commit is contained in:
Alex Dima 2020-09-18 21:55:20 +02:00
parent 6a4cd5fe25
commit 60477286f3
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/dockerfile/dockerfile.test.ts
View file

@ -223,5 +223,21 @@ testTokenization('dockerfile', [
{ startIndex: 45, type: 'string.dockerfile' } { startIndex: 45, type: 'string.dockerfile' }
] ]
} }
],
[
{
line: "RUN \\'e\\'",
tokens: [
{ startIndex: 0, type: 'keyword.dockerfile' },
{ startIndex: 3, type: '' }
]
},
{
line: 'RUN echo hi this is # not a comment',
tokens: [
{ startIndex: 0, type: 'keyword.dockerfile' },
{ startIndex: 3, type: '' }
]
}
] ]
]); ]);

2
src/dockerfile/dockerfile.ts
View file

@ -99,6 +99,8 @@ export const language = <languages.IMonarchLanguage>{
// Recognize strings, including those broken across lines with \ (but not without) // Recognize strings, including those broken across lines with \ (but not without)
strings: [ strings: [
[/\\'$/, '', '@popall'], // \' leaves @arguments at eol
[/\\'/, ''], // \' is not a string
[/'$/, 'string', '@popall'], [/'$/, 'string', '@popall'],
[/'/, 'string', '@stringBody'], [/'/, 'string', '@stringBody'],
[/"$/, 'string', '@popall'], [/"$/, 'string', '@popall'],