Skip to content

Fix Python multi-line f-strings. #5272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yilei wants to merge 1 commit into
base: main
Choose a base branch
from
+149 −2
Open

Fix Python multi-line f-strings. #5272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 125 additions & 0 deletions src/languages/definitions/python/python.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,130 @@ testTokenization('python', [
{ startIndex: 6, type: 'string.escape.python' }
]
}
],

// https://github.com/microsoft/monaco-editor/issues/4601
// Multiline triple-quoted f-strings.
[
{
line: 'x = f"""first line',
tokens: [
{ startIndex: 0, type: 'identifier.python' },
{ startIndex: 1, type: 'white.python' },
{ startIndex: 2, type: '' },
{ startIndex: 3, type: 'white.python' },
{ startIndex: 4, type: 'string.escape.python' },
{ startIndex: 8, type: 'string.python' }
]
},
{
line: 'still {var} string',
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 6, type: 'identifier.python' },
{ startIndex: 11, type: 'string.python' }
]
},
{
line: 'last line"""',
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 9, type: 'string.escape.python' }
]
},
{
line: 'y = 1',
tokens: [
{ startIndex: 0, type: 'identifier.python' },
{ startIndex: 1, type: 'white.python' },
{ startIndex: 2, type: '' },
{ startIndex: 3, type: 'white.python' },
{ startIndex: 4, type: 'number.python' }
]
}
],
[
{
line: "x = f'''first line",
tokens: [
{ startIndex: 0, type: 'identifier.python' },
{ startIndex: 1, type: 'white.python' },
{ startIndex: 2, type: '' },
{ startIndex: 3, type: 'white.python' },
{ startIndex: 4, type: 'string.escape.python' },
{ startIndex: 8, type: 'string.python' }
]
},
{
line: 'still {var} string',
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 6, type: 'identifier.python' },
{ startIndex: 11, type: 'string.python' }
]
},
{
line: "last line'''",
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 9, type: 'string.escape.python' }
]
},
{
line: 'y = 1',
tokens: [
{ startIndex: 0, type: 'identifier.python' },
{ startIndex: 1, type: 'white.python' },
{ startIndex: 2, type: '' },
{ startIndex: 3, type: 'white.python' },
{ startIndex: 4, type: 'number.python' }
]
}
],
[
{
line: `f'''it's fine'''`,
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 4, type: 'string.python' },
{ startIndex: 13, type: 'string.escape.python' }
]
}
],
[
{
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: 'rf"str {var} str"',
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 3, type: 'string.python' },
{ startIndex: 7, type: 'identifier.python' },
{ startIndex: 12, type: 'string.python' },
{ startIndex: 16, type: 'string.escape.python' }
]
}
],
[
{
line: 'fr"str {var} str"',
tokens: [
{ startIndex: 0, type: 'string.escape.python' },
{ startIndex: 3, type: 'string.python' },
{ startIndex: 7, type: 'identifier.python' },
{ startIndex: 12, type: 'string.python' },
{ startIndex: 16, type: 'string.escape.python' }
]
}
]
]);
26 changes: 24 additions & 2 deletions src/languages/definitions/python/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,16 @@ export const language = <languages.IMonarchLanguage>{
// Recognize strings, including those broken across lines with \ (but not without)
strings: [
[/'$/, 'string.escape', '@popall'],
[/f'{1,3}/, 'string.escape', '@fStringBody'],
[/[fF][rR]?'''/, 'string.escape', '@fTripleStringBody'],
[/[rR][fF]'''/, 'string.escape', '@fTripleStringBody'],
[/[fF][rR]?'/, 'string.escape', '@fStringBody'],
[/[rR][fF]'/, 'string.escape', '@fStringBody'],
[/'/, 'string.escape', '@stringBody'],
[/"$/, 'string.escape', '@popall'],
[/f"{1,3}/, 'string.escape', '@fDblStringBody'],
[/[fF][rR]?"""/, 'string.escape', '@fDblTripleStringBody'],
[/[rR][fF]"""/, 'string.escape', '@fDblTripleStringBody'],
[/[fF][rR]?"/, 'string.escape', '@fDblStringBody'],
[/[rR][fF]"/, 'string.escape', '@fDblStringBody'],
[/"/, 'string.escape', '@dblStringBody']
],
fStringBody: [
Expand All @@ -264,6 +270,14 @@ export const language = <languages.IMonarchLanguage>{
[/'/, 'string.escape', '@popall'],
[/\\$/, 'string']
],
fTripleStringBody: [
[/[^\\'\{\}]+/, 'string'],
[/\{[^\}':!=]+/, 'identifier', '@fStringDetail'],
[/\\./, 'string'],
[/'''/, 'string.escape', '@popall'],
[/'/, 'string'],
[/\\$/, 'string']
],
stringBody: [
[/[^\\']+$/, 'string', '@popall'],
[/[^\\']+/, 'string'],
Expand All @@ -279,6 +293,14 @@ export const language = <languages.IMonarchLanguage>{
[/"/, 'string.escape', '@popall'],
[/\\$/, 'string']
],
fDblTripleStringBody: [
[/[^\\"\{\}]+/, 'string'],
[/\{[^\}':!=]+/, 'identifier', '@fStringDetail'],
[/\\./, 'string'],
[/"""/, 'string.escape', '@popall'],
[/"/, 'string'],
[/\\$/, 'string']
],
dblStringBody: [
[/[^\\"]+$/, 'string', '@popall'],
[/[^\\"]+/, 'string'],
Expand Down
Loading