language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 05:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Track quoting style in the tokenizer (#10256)

Browse source
This commit is contained in:
Alex Waygood 2024-03-08 08:40:06 +00:00 • committed by GitHub
parent 72c9f7e4c9
commit c504d7ab11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
55 changed files with 4595 additions and 3800 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__empty_fstrings.snap
View file

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -14,13 +20,22 @@ expression: lex_source(source)
(
String {
value: "",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
4..6,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
7..9,
),
(
@ -28,7 +43,13 @@ expression: lex_source(source)
9..10,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
11..13,
),
(
@ -38,13 +59,22 @@ expression: lex_source(source)
(
String {
value: "",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
15..17,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
),
18..22,
),
(
@ -52,7 +82,13 @@ expression: lex_source(source)
22..25,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
),
26..30,
),
(

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

@ -6,8 +6,11 @@ expression: lex_source(source)
(
String {
value: "\\N{EN SPACE}",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
0..14,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
FStringMiddle {
value: "normal ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
2..9,
),
@ -32,8 +41,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " {another} ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
14..27,
),
@ -54,8 +66,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " {",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
32..35,
),
@ -76,8 +91,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
42..44,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
),
0..4,
),
(
FStringMiddle {
value: "\n# not a comment ",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
},
4..21,
),
@ -46,8 +55,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " # not a comment\n",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
},
42..59,
),

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

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -34,8 +40,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
7..8,
),
@ -70,8 +79,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
14..15,
),
@ -92,8 +104,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: ".3f!r",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
18..23,
),
@ -104,8 +119,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " {x!r}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
24..32,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
FStringMiddle {
value: "\\",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
2..3,
),
@ -32,8 +41,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "\\\"\\",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
6..9,
),
@ -58,8 +70,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " \\\"\\\"\\\n end",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
13..24,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
0..2,
),
(
FStringMiddle {
value: "\\",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
2..3,
),
@ -34,14 +43,23 @@ expression: lex_source(source)
8..9,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
10..12,
),
(
FStringMiddle {
value: "\\\\",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
12..14,
),
@ -64,14 +82,23 @@ expression: lex_source(source)
19..20,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
21..23,
),
(
FStringMiddle {
value: "\\{foo}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
23..31,
),
@ -80,14 +107,23 @@ expression: lex_source(source)
31..32,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
33..35,
),
(
FStringMiddle {
value: "\\\\{foo}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
35..44,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
0..3,
),
(
FStringMiddle {
value: "\\",
is_raw: true,
triple_quoted: false,
kind: StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
},
3..4,
),
@ -32,8 +41,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "\\\"\\",
is_raw: true,
triple_quoted: false,
kind: StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
},
7..10,
),
@ -58,8 +70,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " \\\"\\\"\\\n end",
is_raw: true,
triple_quoted: false,
kind: StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
},
14..25,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
FStringMiddle {
value: "first ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
2..8,
),
@ -58,8 +67,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " second",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
41..48,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
),
0..4,
),
(
FStringMiddle {
value: "\nhello\n world\n",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
},
4..21,
),
@ -20,14 +29,23 @@ expression: lex_source(source)
21..24,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
),
25..29,
),
(
FStringMiddle {
value: "\n world\nhello\n",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
29..46,
),
@ -36,14 +54,23 @@ expression: lex_source(source)
46..49,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
50..52,
),
(
FStringMiddle {
value: "some ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
52..57,
),
@ -52,14 +79,23 @@ expression: lex_source(source)
57..58,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
),
58..62,
),
(
FStringMiddle {
value: "multiline\nallowed ",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Double,
},
},
62..80,
),
@ -88,8 +124,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " string",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
87..94,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
FStringMiddle {
value: "\\N{BULLET} normal \\Nope \\N",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
2..28,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
0..3,
),
(
FStringMiddle {
value: "\\N",
is_raw: true,
triple_quoted: false,
kind: StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
},
3..5,
),
@ -32,8 +41,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " normal",
is_raw: true,
triple_quoted: false,
kind: StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
},
13..20,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
FStringMiddle {
value: "foo ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
2..6,
),
@ -20,14 +29,23 @@ expression: lex_source(source)
6..7,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
7..9,
),
(
FStringMiddle {
value: "bar ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
9..13,
),
@ -46,7 +64,13 @@ expression: lex_source(source)
16..17,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
18..20,
),
(
@ -82,8 +106,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " baz",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
29..33,
),
@ -92,14 +119,23 @@ expression: lex_source(source)
33..34,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
35..37,
),
(
FStringMiddle {
value: "foo ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
37..41,
),
@ -108,14 +144,23 @@ expression: lex_source(source)
41..42,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
42..44,
),
(
FStringMiddle {
value: "bar",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
44..47,
),
@ -130,8 +175,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " some ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
49..55,
),
@ -140,14 +188,23 @@ expression: lex_source(source)
55..56,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
56..58,
),
(
FStringMiddle {
value: "another",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
58..65,
),

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

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -20,14 +26,23 @@ expression: lex_source(source)
4..5,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
6..8,
),
(
FStringMiddle {
value: "{}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
8..12,
),
@ -36,14 +51,23 @@ expression: lex_source(source)
12..13,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
14..16,
),
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
16..17,
),
@ -60,14 +84,23 @@ expression: lex_source(source)
19..20,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
21..23,
),
(
FStringMiddle {
value: "{",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
23..25,
),
@ -82,8 +115,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
27..29,
),
@ -92,14 +128,23 @@ expression: lex_source(source)
29..30,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
31..33,
),
(
FStringMiddle {
value: "{{}}",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
33..41,
),
@ -108,14 +153,23 @@ expression: lex_source(source)
41..42,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
43..45,
),
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
45..46,
),
@ -130,8 +184,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " {} {",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
48..56,
),
@ -146,8 +203,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "} {{}} ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
58..71,
),

80
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_prefix.snap
View file

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -12,7 +18,13 @@ expression: lex_source(source)
2..3,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
4..6,
),
(
@ -20,7 +32,13 @@ expression: lex_source(source)
6..7,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
8..11,
),
(
@ -28,7 +46,13 @@ expression: lex_source(source)
11..12,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
13..16,
),
(
@ -36,7 +60,13 @@ expression: lex_source(source)
16..17,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
18..21,
),
(
@ -44,7 +74,13 @@ expression: lex_source(source)
21..22,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
23..26,
),
(
@ -52,7 +88,13 @@ expression: lex_source(source)
26..27,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
28..31,
),
(
@ -60,7 +102,13 @@ expression: lex_source(source)
31..32,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
33..36,
),
(
@ -68,7 +116,13 @@ expression: lex_source(source)
36..37,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
38..41,
),
(
@ -76,7 +130,13 @@ expression: lex_source(source)
41..42,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "rf",
triple_quoted: false,
quote_style: Double,
},
),
43..46,
),
(

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

@ -4,14 +4,23 @@ expression: fstring_single_quote_escape_eol(MAC_EOL)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
0..2,
),
(
FStringMiddle {
value: "text \\\r more text",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
2..19,
),

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

@ -4,14 +4,23 @@ expression: fstring_single_quote_escape_eol(UNIX_EOL)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
0..2,
),
(
FStringMiddle {
value: "text \\\n more text",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
2..19,
),

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

@ -4,14 +4,23 @@ expression: fstring_single_quote_escape_eol(WINDOWS_EOL)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
0..2,
),
(
FStringMiddle {
value: "text \\\r\n more text",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
2..20,
),

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

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -28,8 +34,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
8..9,
),
@ -64,8 +73,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: ".3f",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
15..18,
),
@ -76,8 +88,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
19..20,
),
@ -98,8 +113,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: ".",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
23..24,
),
@ -120,8 +138,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "f",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
27..28,
),
@ -132,8 +153,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
29..30,
),
@ -144,8 +168,11 @@ expression: lex_source(source)
(
String {
value: "",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
31..33,
),
@ -156,8 +183,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "*^",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
34..36,
),
@ -200,8 +230,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
44..45,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
FStringMiddle {
value: "foo ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
2..6,
),
@ -36,8 +45,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " bar",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
12..16,
),

16
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__fstring_with_lambda_expression.snap
View file

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -52,7 +58,13 @@ expression: lex_source(source)
17..18,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
18..20,
),
(

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
),
0..4,
),
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
4..6,
),
@ -36,8 +45,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "d\n",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
14..16,
),
@ -48,8 +60,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
17..19,
),
@ -62,14 +77,23 @@ expression: lex_source(source)
22..23,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
),
23..27,
),
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
27..29,
),
@ -94,8 +118,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "a\n b\n c\n",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
37..61,
),
@ -106,8 +133,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: true,
kind: StringKind {
prefix: "f",
triple_quoted: true,
quote_style: Single,
},
},
62..64,
),
@ -120,14 +150,23 @@ expression: lex_source(source)
67..68,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
68..70,
),
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
70..72,
),
@ -152,8 +191,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "d",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
80..81,
),
@ -168,8 +210,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
83..85,
),
@ -182,14 +227,23 @@ expression: lex_source(source)
86..87,
),
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
87..89,
),
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
89..91,
),
@ -214,8 +268,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "a",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
99..100,
),
@ -240,8 +297,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "__",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
112..114,
),

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

@ -4,7 +4,13 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
),
0..2,
),
(
@ -24,8 +30,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: "=10",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
5..8,
),
@ -36,8 +45,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
9..10,
),
@ -76,8 +88,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
19..20,
),
@ -126,8 +141,11 @@ expression: lex_source(source)
(
FStringMiddle {
value: " ",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Double,
},
},
31..32,
),

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

@ -4,14 +4,23 @@ expression: lex_source(source)
---
[
(
FStringStart,
FStringStart(
StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
),
0..2,
),
(
FStringMiddle {
value: "\\0",
is_raw: false,
triple_quoted: false,
kind: StringKind {
prefix: "f",
triple_quoted: false,
quote_style: Single,
},
},
2..4,
),

28
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__non_logical_newline_in_string_continuation.snap
View file

@ -14,8 +14,11 @@ expression: lex_source(source)
(
String {
value: "a",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
6..9,
),
@ -26,8 +29,11 @@ expression: lex_source(source)
(
String {
value: "b",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
14..17,
),
@ -42,16 +48,22 @@ expression: lex_source(source)
(
String {
value: "c",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
23..26,
),
(
String {
value: "d",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
33..36,
),

63
crates/ruff_python_parser/src/snapshots/ruff_python_parser__lexer__tests__string.snap
View file

@ -6,72 +6,99 @@ expression: lex_source(source)
(
String {
value: "double",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
0..8,
),
(
String {
value: "single",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
9..17,
),
(
String {
value: "can\\'t",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
18..26,
),
(
String {
value: "\\\\\\\"",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
27..33,
),
(
String {
value: "\\t\\r\\n",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
34..42,
),
(
String {
value: "\\g",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
43..47,
),
(
String {
value: "raw\\'",
kind: RawString,
triple_quoted: false,
kind: StringKind {
prefix: "r",
triple_quoted: false,
quote_style: Single,
},
},
48..56,
),
(
String {
value: "\\420",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
57..63,
),
(
String {
value: "\\200\\0a",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Single,
},
},
64..73,
),

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

@ -6,8 +6,11 @@ expression: string_continuation_with_eol(MAC_EOL)
(
String {
value: "abc\\\rdef",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
0..10,
),

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

@ -6,8 +6,11 @@ expression: string_continuation_with_eol(UNIX_EOL)
(
String {
value: "abc\\\ndef",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
0..10,
),

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

@ -6,8 +6,11 @@ expression: string_continuation_with_eol(WINDOWS_EOL)
(
String {
value: "abc\\\r\ndef",
kind: String,
triple_quoted: false,
kind: StringKind {
prefix: "",
triple_quoted: false,
quote_style: Double,
},
},
0..11,
),

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

@ -6,8 +6,11 @@ expression: triple_quoted_eol(MAC_EOL)
(
String {
value: "\r test string\r ",
kind: String,
triple_quoted: true,
kind: StringKind {
prefix: "",
triple_quoted: true,
quote_style: Double,
},
},
0..21,
),

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

@ -6,8 +6,11 @@ expression: triple_quoted_eol(UNIX_EOL)
(
String {
value: "\n test string\n ",
kind: String,
triple_quoted: true,
kind: StringKind {
prefix: "",
triple_quoted: true,
quote_style: Double,
},
},
0..21,
),

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

@ -6,8 +6,11 @@ expression: triple_quoted_eol(WINDOWS_EOL)
(
String {
value: "\r\n test string\r\n ",
kind: String,
triple_quoted: true,
kind: StringKind {
prefix: "",
triple_quoted: true,
quote_style: Double,
},
},
0..23,
),