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

Add support for Python multiline f-strings

Browse source 
Initial support for f-strings was added in
https://github.com/microsoft/monaco-editor/pull/4401, but it didn't
support multiline f-strings, as reported in
https://github.com/microsoft/monaco-editor/issues/4601
This commit is contained in:
Anton Gogolev 2024-10-25 09:16:39 +02:00
parent 4dc7b06d9b
commit 4e68558997
2 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/basic-languages/python/python.test.ts
View file

@ -216,6 +216,57 @@ testTokenization('python', [
]
}
],
// https://github.com/microsoft/monaco-editor/issues/4601
[
{
line: `f'''str `,
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 4, type: 'string.python' }
]
},
{
line: ` str "{var}" {{ {{ }} `,
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 6, type: 'identifier.python' },
{ startIndex: 11, type: 'string.python' }
]
},
{
line: `str'''`,
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 3, type: 'string.escape.python' }
]
}
],
[
{
line: `f"""str `,
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 4, type: 'string.python' }
]
},
{
line: ` str '{var}' {{ {{ }} `,
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 6, type: 'identifier.python' },
{ startIndex: 11, type: 'string.python' }
]
},
{
line: `str"""`,
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 3, type: 'string.escape.python' }
]
}
],
[
{
line: 'f"{var:.3f}{var!r}{var=}"',

6
src/basic-languages/python/python.ts
View file

@ -257,7 +257,8 @@ export const language = <languages.IMonarchLanguage>{
[/"/, 'string.escape', '@dblStringBody']
],
fStringBody: [
[/[^\\'\{\}]+$/, 'string', '@popall'],
[/\{\{/, 'string'],
[/\}\}/, 'string'],
[/[^\\'\{\}]+/, 'string'],
[/\{[^\}':!=]+/, 'identifier', '@fStringDetail'],
[/\\./, 'string'],
@ -272,7 +273,8 @@ export const language = <languages.IMonarchLanguage>{
[/\\$/, 'string']
],
fDblStringBody: [
[/[^\\"\{\}]+$/, 'string', '@popall'],
[/\{\{/, 'string'],
[/\}\}/, 'string'],
[/[^\\"\{\}]+/, 'string'],
[/\{[^\}':!=]+/, 'identifier', '@fStringDetail'],
[/\\./, 'string'],