Upgrade RustPython to access ranged names
#5194
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charliermarsh
force-pushed
the
charlie/id
branch
2 times, most recently
from
61a850a
to
212c368
Compare
charliermarsh
force-pushed
the
charlie/id
branch
from
212c368
to
06c4538
Compare
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinuxWindows |
MichaReiser
reviewed
Jun 20, 2023
| @@ -622,8 +625,13 @@ fn handle_positional_only_arguments_separator_comment<'a>( | |||
| return CommentPlacement::Default(comment); | |||
| }; | |||
|
|
|||
| let is_last_positional_argument = are_same_optional(last_argument_or_default, arguments.posonlyargs.last()) | |||
| // If the preceding node is the default for the last positional argument | |||
| let is_last_positional_argument = | |||
There was a problem hiding this comment.
- I wonder if we can simplify this now by simply using the argument with default range. Also... did you override the new visit methods in the CommentVisitor?
MichaReiser
approved these changes
Jun 20, 2023
There was a problem hiding this comment.
Looks good. Some other places that could use the new Identifier range
- Function definition formatting: https://github.com/charliermarsh/ruff/blob/84dd7db9c367e4aeeb2fbfc156a1f760787871e6/crates/ruff_python_formatter/src/statement/stmt_function_def.rs#L88
- Argument formatting https://github.com/charliermarsh/ruff/blob/84dd7db9c367e4aeeb2fbfc156a1f760787871e6/crates/ruff_python_formatter/src/other/arg.rs#L23
charliermarsh
force-pushed
the
charlie/id
branch
from
06c4538
to
88fbc72
Compare
charliermarsh
force-pushed
the
charlie/id
branch
from
88fbc72
to
c91090a
Compare
charliermarsh
force-pushed
the
charlie/id
branch
from
c91090a
to
b921b23
Compare
charliermarsh
commented
Jun 20, 2023
| @@ -53,6 +47,19 @@ syn = { version = "2.0.15" } | |||
| test-case = { version = "3.0.0" } | |||
| toml = { version = "0.7.2" } | |||
|
|
|||
| # v0.0.1 | |||
| libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" } | |||
| # v0.0.3 | |||
There was a problem hiding this comment.
FYI @MichaReiser - I'm going to start documenting these here so that we don't forget to update the tags.
charliermarsh
added a commit
that referenced
this pull request
Jun 20, 2023
## Summary Now that all identifiers include ranges (#5194), we can remove a ton of this "custom lexing" code that we have to sketchily extract identifier ranges from source. ## Test Plan `cargo test`
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
In astral-sh/RustPython-Parser#8, we modified RustPython to include ranges for any identifiers that aren't
Expr::Name(which already has an identifier).For example, the
einexcept ValueError as ewas previously un-ranged. To extract its range, we had to do some lexing of our own. This change should improve performance and let us remove a bunch of code.Test Plan
cargo test