Skip to content

Ignore quote escapes in expression part of f-string#7597

Merged
dhruvmanila merged 3 commits intodhruv/pep-701from
dhruv/formatter-fstring-quote
Sep 25, 2023
Merged

Ignore quote escapes in expression part of f-string#7597
dhruvmanila merged 3 commits intodhruv/pep-701from
dhruv/formatter-fstring-quote

Conversation

@dhruvmanila
Copy link
Member

@dhruvmanila dhruvmanila commented Sep 22, 2023 •
edited
Loading

Summary

This PR fixes the following issues w.r.t. the PEP 701 changes:

  1. Mark all unformatted comments inside f-strings as formatted only after the
    f-string has been formatted.
  2. Do not escape or remove the quote escape when normalizing the expression
    part of a f-string.

This PR also updates the --files-with-errors number to be 1 less. This is
because we can now parse the test_fstring.py
file in the CPython repository which contains the new f-string syntax. This is
also the file which updates the similarity index for CPython compared to main.

Test Plan

cargo test -p ruff_python_formatter

Ecosystem checks

dhruv/formatter-fstring-quote

project similarity index total files changed files
cpython 0.76051 1789 1632
django 0.99983 2760 36
transformers 0.99963 2587 323
twine 1.00000 33 0
typeshed 0.99979 3496 22
warehouse 0.99967 648 15
zulip 0.99972 1437 21

main

project similarity index total files changed files
cpython 0.76083 1789 1631
django 0.99983 2760 36
transformers 0.99963 2587 323
twine 1.00000 33 0
typeshed 0.99979 3496 22
warehouse 0.99967 648 15
zulip 0.99972 1437 21

This was referenced Sep 22, 2023
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@dhruvmanila
Copy link
Member Author

dhruvmanila commented Sep 22, 2023 •
edited
Loading

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

This was referenced Sep 22, 2023
Merged
Merged
Merged
@dhruvmanila dhruvmanila force-pushed the dhruv/formatter-fstring-quote branch from 0fa1e61 to e357be1 Compare September 22, 2023 13:12
@dhruvmanila dhruvmanila added formatter Related to the formatter python312 Related to Python 3.12 labels Sep 22, 2023
charliermarsh
charliermarsh reviewed Sep 22, 2023
View reviewed changes
MichaReiser
MichaReiser reviewed Sep 22, 2023
View reviewed changes
@dhruvmanila dhruvmanila merged commit f5cd461 into dhruv/pep-701 Sep 25, 2023
@dhruvmanila dhruvmanila deleted the dhruv/formatter-fstring-quote branch September 25, 2023 07:36
@dhruvmanila dhruvmanila linked an issue Sep 25, 2023 that may be closed by this pull request
Update FormatStringContinuation to use the new f-string tokens #7517
Closed
dhruvmanila added a commit that referenced this pull request Sep 26, 2023
@dhruvmanila
Ignore quote escapes in expression part of f-string (#7597)
917cace 
## Summary

This PR fixes the following issues w.r.t. the PEP 701 changes:
1. Mark all unformatted comments inside f-strings as formatted only _after_ the
   f-string has been formatted.
2. Do not escape or remove the quote escape when normalizing the expression
   part of a f-string.

This PR also updates the `--files-with-errors` number to be 1 less. This is
because we can now parse the
[`test_fstring.py`](https://discord.com/channels/1039017663004942429/1082324263199064206/1154633274887516254)
file in the CPython repository which contains the new f-string syntax. This is
also the file which updates the similarity index for CPython compared to main.

## Test Plan

`cargo test -p ruff_python_formatter`

### Ecosystem checks

#### `dhruv/formatter-fstring-quote`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76051 | 1789 | 1632 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |

#### `main`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76083 | 1789 | 1631 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |
@dhruvmanila dhruvmanila mentioned this pull request Sep 26, 2023
Merged
dhruvmanila added a commit that referenced this pull request Sep 27, 2023
@dhruvmanila
Ignore quote escapes in expression part of f-string (#7597)
40c9902 
## Summary

This PR fixes the following issues w.r.t. the PEP 701 changes:
1. Mark all unformatted comments inside f-strings as formatted only _after_ the
   f-string has been formatted.
2. Do not escape or remove the quote escape when normalizing the expression
   part of a f-string.

This PR also updates the `--files-with-errors` number to be 1 less. This is
because we can now parse the
[`test_fstring.py`](https://discord.com/channels/1039017663004942429/1082324263199064206/1154633274887516254)
file in the CPython repository which contains the new f-string syntax. This is
also the file which updates the similarity index for CPython compared to main.

## Test Plan

`cargo test -p ruff_python_formatter`

### Ecosystem checks

#### `dhruv/formatter-fstring-quote`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76051 | 1789 | 1632 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |

#### `main`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76083 | 1789 | 1631 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |
dhruvmanila added a commit that referenced this pull request Sep 28, 2023
@dhruvmanila
Ignore quote escapes in expression part of f-string (#7597)
d224015 
## Summary

This PR fixes the following issues w.r.t. the PEP 701 changes:
1. Mark all unformatted comments inside f-strings as formatted only _after_ the
   f-string has been formatted.
2. Do not escape or remove the quote escape when normalizing the expression
   part of a f-string.

This PR also updates the `--files-with-errors` number to be 1 less. This is
because we can now parse the
[`test_fstring.py`](https://discord.com/channels/1039017663004942429/1082324263199064206/1154633274887516254)
file in the CPython repository which contains the new f-string syntax. This is
also the file which updates the similarity index for CPython compared to main.

## Test Plan

`cargo test -p ruff_python_formatter`

### Ecosystem checks

#### `dhruv/formatter-fstring-quote`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76051 | 1789 | 1632 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |

#### `main`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76083 | 1789 | 1631 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |
@dhruvmanila dhruvmanila mentioned this pull request Sep 28, 2023
Merged
dhruvmanila added a commit that referenced this pull request Sep 29, 2023
@dhruvmanila
Ignore quote escapes in expression part of f-string (#7597)
01123d5 
This PR fixes the following issues w.r.t. the PEP 701 changes:
1. Mark all unformatted comments inside f-strings as formatted only _after_ the
   f-string has been formatted.
2. Do not escape or remove the quote escape when normalizing the expression
   part of a f-string.

This PR also updates the `--files-with-errors` number to be 1 less. This is
because we can now parse the
[`test_fstring.py`](https://discord.com/channels/1039017663004942429/1082324263199064206/1154633274887516254)
file in the CPython repository which contains the new f-string syntax. This is
also the file which updates the similarity index for CPython compared to main.

`cargo test -p ruff_python_formatter`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76051 | 1789 | 1632 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76083 | 1789 | 1631 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |
dhruvmanila added a commit that referenced this pull request Sep 29, 2023
@dhruvmanila
Ignore quote escapes in expression part of f-string (#7597)
e4e2b45 
This PR fixes the following issues w.r.t. the PEP 701 changes:
1. Mark all unformatted comments inside f-strings as formatted only _after_ the
   f-string has been formatted.
2. Do not escape or remove the quote escape when normalizing the expression
   part of a f-string.

This PR also updates the `--files-with-errors` number to be 1 less. This is
because we can now parse the
[`test_fstring.py`](https://discord.com/channels/1039017663004942429/1082324263199064206/1154633274887516254)
file in the CPython repository which contains the new f-string syntax. This is
also the file which updates the similarity index for CPython compared to main.

`cargo test -p ruff_python_formatter`

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76051 | 1789 | 1632 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |

| project | similarity index | total files | changed files |

|--------------|------------------:|------------------:|------------------:|
| cpython | 0.76083 | 1789 | 1631 |
| django | 0.99983 | 2760 | 36 |
| transformers | 0.99963 | 2587 | 323 |
| twine | 1.00000 | 33 | 0 |
| typeshed | 0.99979 | 3496 | 22 |
| warehouse | 0.99967 | 648 | 15 |
| zulip | 0.99972 | 1437 | 21 |
dhruvmanila added a commit that referenced this pull request Sep 29, 2023
@dhruvmanila
Add support for PEP 701 (#7376)
e62e245 
## Summary

This PR adds support for PEP 701 in Ruff. This is a rollup PR of all the
other individual PRs. The separate PRs were created for logic separation
and code reviews. Refer to each pull request for a detail description on
the change.

Refer to the PR description for the list of pull requests within this PR.

## Test Plan

### Formatter ecosystem checks

Explanation for the change in ecosystem check:
#7597 (comment)

#### `main`

```
| project      | similarity index  | total files       | changed files     |
|--------------|------------------:|------------------:|------------------:|
| cpython      |           0.76083 |              1789 |              1631 |
| django       |           0.99983 |              2760 |                36 |
| transformers |           0.99963 |              2587 |               319 |
| twine        |           1.00000 |                33 |                 0 |
| typeshed     |           0.99983 |              3496 |                18 |
| warehouse    |           0.99967 |               648 |                15 |
| zulip        |           0.99972 |              1437 |                21 |
```

#### `dhruv/pep-701`

```
| project      | similarity index  | total files       | changed files     |
|--------------|------------------:|------------------:|------------------:|
| cpython      |           0.76051 |              1789 |              1632 |
| django       |           0.99983 |              2760 |                36 |
| transformers |           0.99963 |              2587 |               319 |
| twine        |           1.00000 |                33 |                 0 |
| typeshed     |           0.99983 |              3496 |                18 |
| warehouse    |           0.99967 |               648 |                15 |
| zulip        |           0.99972 |              1437 |                21 |
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaReiser MichaReiser MichaReiser approved these changes

@charliermarsh charliermarsh charliermarsh approved these changes

Assignees

No one assigned

Labels

formatter Related to the formatter python312 Related to Python 3.12

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update FormatStringContinuation to use the new f-string tokens

3 participants

@dhruvmanila @MichaReiser @charliermarsh