Skip to content

fix: improve f-strings even more #10

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

Merged
jvllmr merged 4 commits into from
Jan 18, 2025
Merged

fix: improve f-strings even more #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf70c76
fix: cover more extreme edge cases for f-string
jvllmr Jan 18, 2025
d5d03e2
fix: improve f-strings even more
jvllmr Jan 18, 2025
0d78ddc
Merge branch 'dev' into edge-cases-f-string
jvllmr Jan 18, 2025
b8e9dd1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 18, 2025
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
14 changes: 11 additions & 3 deletions src/unparser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,10 +1035,18 @@ impl Unparser {

let has_single = escaped_source.contains("'");
let has_double = escaped_source.contains("\"");
let has_single_doc = escaped_source.contains("'''");
if has_single && has_double && has_single_doc {

if has_single
&& has_double
&& escaped_source.starts_with("\"")
&& escaped_source.ends_with("\"")
{
escaped_source = replace_first_and_last(&escaped_source, "\"\"\"")
} else if has_single && has_double {
} else if has_single
&& has_double
&& escaped_source.starts_with("'")
&& escaped_source.ends_with("'")
{
escaped_source = replace_first_and_last(&escaped_source, "'''")
} else if has_single {
escaped_source = replace_first_and_last(&escaped_source, "\"")
Expand Down
3 changes: 3 additions & 0 deletions test_files/f_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
for (k, v) in attribs.items() # noqa
)
)

completion_init_lines = [f"source '{completion_path}'"] # noqa

# fmt: on
Loading