mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-21 02:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Index multiline f-strings (#9837)

Browse source 
Fix #9777.
This commit is contained in:
Seo Sanghyeon 2024-02-06 11:25:33 +09:00 • committed by GitHub
parent 83195a6030
commit df7fb95cbc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 180 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "normal ",
is_raw: false,
triple_quoted: false,
},
2..9,
),
@ -32,6 +33,7 @@ expression: lex_source(source)
FStringMiddle {
value: " {another} ",
is_raw: false,
triple_quoted: false,
},
14..27,
),
@ -53,6 +55,7 @@ expression: lex_source(source)
FStringMiddle {
value: " {",
is_raw: false,
triple_quoted: false,
},
32..35,
),
@ -74,6 +77,7 @@ expression: lex_source(source)
FStringMiddle {
value: "}",
is_raw: false,
triple_quoted: false,
},
42..44,
),

2
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_comments.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\n# not a comment ",
is_raw: false,
triple_quoted: true,
},
4..21,
),
@ -46,6 +47,7 @@ expression: lex_source(source)
FStringMiddle {
value: " # not a comment\n",
is_raw: false,
triple_quoted: true,
},
42..59,
),

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_conversion.snap
View file

@ -35,6 +35,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
7..8,
),
@ -70,6 +71,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
14..15,
),
@ -91,6 +93,7 @@ expression: lex_source(source)
FStringMiddle {
value: ".3f!r",
is_raw: false,
triple_quoted: false,
},
18..23,
),
@ -102,6 +105,7 @@ expression: lex_source(source)
FStringMiddle {
value: " {x!r}",
is_raw: false,
triple_quoted: false,
},
24..32,
),

3
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_escape.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\",
is_raw: false,
triple_quoted: false,
},
2..3,
),
@ -32,6 +33,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\\"\\",
is_raw: false,
triple_quoted: false,
},
6..9,
),
@ -57,6 +59,7 @@ expression: lex_source(source)
FStringMiddle {
value: " \\\"\\\"\\\n end",
is_raw: false,
triple_quoted: false,
},
13..24,
),

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_escape_braces.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\",
is_raw: false,
triple_quoted: false,
},
2..3,
),
@ -40,6 +41,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\\\",
is_raw: false,
triple_quoted: false,
},
12..14,
),
@ -69,6 +71,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\{foo}",
is_raw: false,
triple_quoted: false,
},
23..31,
),
@ -84,6 +87,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\\\{foo}",
is_raw: false,
triple_quoted: false,
},
35..44,
),

3
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_escape_raw.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\",
is_raw: true,
triple_quoted: false,
},
3..4,
),
@ -32,6 +33,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\\"\\",
is_raw: true,
triple_quoted: false,
},
7..10,
),
@ -57,6 +59,7 @@ expression: lex_source(source)
FStringMiddle {
value: " \\\"\\\"\\\n end",
is_raw: true,
triple_quoted: false,
},
14..25,
),

2
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_expression_multiline.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "first ",
is_raw: false,
triple_quoted: false,
},
2..8,
),
@ -58,6 +59,7 @@ expression: lex_source(source)
FStringMiddle {
value: " second",
is_raw: false,
triple_quoted: false,
},
41..48,
),

5
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_multiline.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\nhello\n world\n",
is_raw: false,
triple_quoted: true,
},
4..21,
),
@ -26,6 +27,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\n world\nhello\n",
is_raw: false,
triple_quoted: true,
},
29..46,
),
@ -41,6 +43,7 @@ expression: lex_source(source)
FStringMiddle {
value: "some ",
is_raw: false,
triple_quoted: false,
},
52..57,
),
@ -56,6 +59,7 @@ expression: lex_source(source)
FStringMiddle {
value: "multiline\nallowed ",
is_raw: false,
triple_quoted: true,
},
62..80,
),
@ -85,6 +89,7 @@ expression: lex_source(source)
FStringMiddle {
value: " string",
is_raw: false,
triple_quoted: false,
},
87..94,
),

1
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_named_unicode.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\N{BULLET} normal \\Nope \\N",
is_raw: false,
triple_quoted: false,
},
2..28,
),

2
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_named_unicode_raw.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\N",
is_raw: true,
triple_quoted: false,
},
3..5,
),
@ -32,6 +33,7 @@ expression: lex_source(source)
FStringMiddle {
value: " normal",
is_raw: true,
triple_quoted: false,
},
13..20,
),

7
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_nested.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "foo ",
is_raw: false,
triple_quoted: false,
},
2..6,
),
@ -26,6 +27,7 @@ expression: lex_source(source)
FStringMiddle {
value: "bar ",
is_raw: false,
triple_quoted: false,
},
9..13,
),
@ -81,6 +83,7 @@ expression: lex_source(source)
FStringMiddle {
value: " baz",
is_raw: false,
triple_quoted: false,
},
29..33,
),
@ -96,6 +99,7 @@ expression: lex_source(source)
FStringMiddle {
value: "foo ",
is_raw: false,
triple_quoted: false,
},
37..41,
),
@ -111,6 +115,7 @@ expression: lex_source(source)
FStringMiddle {
value: "bar",
is_raw: false,
triple_quoted: false,
},
44..47,
),
@ -126,6 +131,7 @@ expression: lex_source(source)
FStringMiddle {
value: " some ",
is_raw: false,
triple_quoted: false,
},
49..55,
),
@ -141,6 +147,7 @@ expression: lex_source(source)
FStringMiddle {
value: "another",
is_raw: false,
triple_quoted: false,
},
58..65,
),

8
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_parentheses.snap
View file

@ -27,6 +27,7 @@ expression: lex_source(source)
FStringMiddle {
value: "{}",
is_raw: false,
triple_quoted: false,
},
8..12,
),
@ -42,6 +43,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
16..17,
),
@ -65,6 +67,7 @@ expression: lex_source(source)
FStringMiddle {
value: "{",
is_raw: false,
triple_quoted: false,
},
23..25,
),
@ -80,6 +83,7 @@ expression: lex_source(source)
FStringMiddle {
value: "}",
is_raw: false,
triple_quoted: false,
},
27..29,
),
@ -95,6 +99,7 @@ expression: lex_source(source)
FStringMiddle {
value: "{{}}",
is_raw: false,
triple_quoted: false,
},
33..41,
),
@ -110,6 +115,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
45..46,
),
@ -125,6 +131,7 @@ expression: lex_source(source)
FStringMiddle {
value: " {} {",
is_raw: false,
triple_quoted: false,
},
48..56,
),
@ -140,6 +147,7 @@ expression: lex_source(source)
FStringMiddle {
value: "} {{}} ",
is_raw: false,
triple_quoted: false,
},
58..71,
),

1
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_single_quote_escape_mac_eol.snap
View file

@ -11,6 +11,7 @@ expression: fstring_single_quote_escape_eol(MAC_EOL)
FStringMiddle {
value: "text \\\r more text",
is_raw: false,
triple_quoted: false,
},
2..19,
),

1
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_single_quote_escape_unix_eol.snap
View file

@ -11,6 +11,7 @@ expression: fstring_single_quote_escape_eol(UNIX_EOL)
FStringMiddle {
value: "text \\\n more text",
is_raw: false,
triple_quoted: false,
},
2..19,
),

1
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_single_quote_escape_windows_eol.snap
View file

@ -11,6 +11,7 @@ expression: fstring_single_quote_escape_eol(WINDOWS_EOL)
FStringMiddle {
value: "text \\\r\n more text",
is_raw: false,
triple_quoted: false,
},
2..20,
),

8
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_with_format_spec.snap
View file

@ -29,6 +29,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
8..9,
),
@ -64,6 +65,7 @@ expression: lex_source(source)
FStringMiddle {
value: ".3f",
is_raw: false,
triple_quoted: false,
},
15..18,
),
@ -75,6 +77,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
19..20,
),
@ -96,6 +99,7 @@ expression: lex_source(source)
FStringMiddle {
value: ".",
is_raw: false,
triple_quoted: false,
},
23..24,
),
@ -117,6 +121,7 @@ expression: lex_source(source)
FStringMiddle {
value: "f",
is_raw: false,
triple_quoted: false,
},
27..28,
),
@ -128,6 +133,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
29..30,
),
@ -151,6 +157,7 @@ expression: lex_source(source)
FStringMiddle {
value: "*^",
is_raw: false,
triple_quoted: false,
},
34..36,
),
@ -194,6 +201,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
44..45,
),

2
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_with_ipy_escape_command.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "foo ",
is_raw: false,
triple_quoted: false,
},
2..6,
),
@ -36,6 +37,7 @@ expression: lex_source(source)
FStringMiddle {
value: " bar",
is_raw: false,
triple_quoted: false,
},
12..16,
),

12
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_with_multiline_format_spec.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
},
4..6,
),
@ -36,6 +37,7 @@ expression: lex_source(source)
FStringMiddle {
value: "d\n",
is_raw: false,
triple_quoted: true,
},
14..16,
),
@ -47,6 +49,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
},
17..19,
),
@ -66,6 +69,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
},
27..29,
),
@ -91,6 +95,7 @@ expression: lex_source(source)
FStringMiddle {
value: "a\n b\n c\n",
is_raw: false,
triple_quoted: true,
},
37..61,
),
@ -102,6 +107,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
},
62..64,
),
@ -121,6 +127,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
},
70..72,
),
@ -146,6 +153,7 @@ expression: lex_source(source)
FStringMiddle {
value: "d",
is_raw: false,
triple_quoted: false,
},
80..81,
),
@ -161,6 +169,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
},
83..85,
),
@ -180,6 +189,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
},
89..91,
),
@ -205,6 +215,7 @@ expression: lex_source(source)
FStringMiddle {
value: "a",
is_raw: false,
triple_quoted: false,
},
99..100,
),
@ -230,6 +241,7 @@ expression: lex_source(source)
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
},
112..114,
),

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_with_named_expression.snap
View file

@ -25,6 +25,7 @@ expression: lex_source(source)
FStringMiddle {
value: "=10",
is_raw: false,
triple_quoted: false,
},
5..8,
),
@ -36,6 +37,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
9..10,
),
@ -75,6 +77,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
19..20,
),
@ -124,6 +127,7 @@ expression: lex_source(source)
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
},
31..32,
),

1
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_with_nul_char.snap
View file

@ -11,6 +11,7 @@ expression: lex_source(source)
FStringMiddle {
value: "\\0",
is_raw: false,
triple_quoted: false,
},
2..4,
),