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

Adding python f-string syntax support

Browse source
This commit is contained in:
samstrohkorbatt 2024-02-26 09:04:22 -08:00
parent 21007360ca
commit 67960d2298
2 changed files with 89 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,5 +189,69 @@ testTokenization('python', [
line: '456.7e-7j', line: '456.7e-7j',
tokens: [{ startIndex: 0, type: 'number.python' }] tokens: [{ startIndex: 0, type: 'number.python' }]
} }
],
// F-Strings
[
{
line: 'f"str {var} str"',
tokens: [
{startIndex: 0, type: 'string.escape.python'},
{startIndex: 2, type: 'string.python'},
{startIndex: 6, type: 'identifier.python'},
{startIndex: 11, type: 'string.python'},
{startIndex: 15, type: 'string.escape.python'}
] ]
}
],
[
{
line: `f'''str {var} str'''`,
tokens: [
{startIndex: 0, type: 'string.escape.python'},
{startIndex: 4, type: 'string.python'},
{startIndex: 8, type: 'identifier.python'},
{startIndex: 13, type: 'string.python'},
{startIndex: 17, type: 'string.escape.python'}
]
}
],
[
{
line: 'f"{var:.3f}{var!r}{var=}"',
tokens: [
{startIndex: 0, type: 'string.escape.python'},
{startIndex: 2, type: 'identifier.python'},
{startIndex: 6, type: 'string.python'},
{startIndex: 10, type: 'identifier.python'},
{startIndex: 15, type: 'string.python'},
{startIndex: 17, type: 'identifier.python'},
{startIndex: 22, type: 'string.python'},
{startIndex: 23, type: 'identifier.python'},
{startIndex: 24, type: 'string.escape.python'}
]
}
],
[
{
line: 'f"\' " "',
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 2, type: 'string.python' },
{ startIndex: 4, type: 'string.escape.python' },
{ startIndex: 5, type: 'white.python' },
{ startIndex: 6, type: 'string.escape.python' }
]
}
],
[
{
line: '"{var}"',
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 1, type: 'string.python' },
{ startIndex: 6, type: 'string.escape.python' }
]
}
],
]); ]);

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

@ -250,10 +250,20 @@ 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: [
[/'$/, 'string.escape', '@popall'], [/'$/, 'string.escape', '@popall'],
[/f'{1,3}/, 'string.escape', '@fStringBody'],
[/'/, 'string.escape', '@stringBody'], [/'/, 'string.escape', '@stringBody'],
[/"$/, 'string.escape', '@popall'], [/"$/, 'string.escape', '@popall'],
[/f"{1,3}/, 'string.escape', '@fDblStringBody'],
[/"/, 'string.escape', '@dblStringBody'] [/"/, 'string.escape', '@dblStringBody']
], ],
fStringBody: [
[/[^\\'\{\}]+$/, 'string', '@popall'],
[/[^\\'\{\}]+/, 'string'],
[/\{[^\}':!=]+/, 'identifier', '@fStringDetail'],
[/\\./, 'string'],
[/'/, 'string.escape', '@popall'],
[/\\$/, 'string']
],
stringBody: [ stringBody: [
[/[^\\']+$/, 'string', '@popall'], [/[^\\']+$/, 'string', '@popall'],
[/[^\\']+/, 'string'], [/[^\\']+/, 'string'],
@ -261,12 +271,26 @@ export const language = <languages.IMonarchLanguage>{
[/'/, 'string.escape', '@popall'], [/'/, 'string.escape', '@popall'],
[/\\$/, 'string'] [/\\$/, 'string']
], ],
fDblStringBody: [
[/[^\\"\{\}]+$/, 'string', '@popall'],
[/[^\\"\{\}]+/, 'string'],
[/\{[^\}':!=]+/, 'identifier', '@fStringDetail'],
[/\\./, 'string'],
[/"/, 'string.escape', '@popall'],
[/\\$/, 'string']
],
dblStringBody: [ dblStringBody: [
[/[^\\"]+$/, 'string', '@popall'], [/[^\\"]+$/, 'string', '@popall'],
[/[^\\"]+/, 'string'], [/[^\\"]+/, 'string'],
[/\\./, 'string'], [/\\./, 'string'],
[/"/, 'string.escape', '@popall'], [/"/, 'string.escape', '@popall'],
[/\\$/, 'string'] [/\\$/, 'string']
],
fStringDetail: [
[/[:][^}]+/, 'string'],
[/[!][ars]/, 'string'], // only !a, !r, !s are supported by f-strings: https://docs.python.org/3/tutorial/inputoutput.html#formatted-string-literals
[/=/, 'string'],
[/\}/, 'identifier', '@pop']
] ]
} }
}; };