handle Python concatenated strings in Rust dependency inference parser #22050
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
tdyas
added
category:internal
4 tasks
tdyas
changed the title
cognifloyd
reviewed
Mar 9, 2025
Comment on lines
-107
to
-109
| self.code_at(range) | ||
| .trim_start_matches(|c| "rRuUfFbB".contains(c)) | ||
| .trim_matches(|c| "'\"".contains(c)) |
There was a problem hiding this comment.
Based on your comments, I think you handled the r"...", u"...", f"...", and b"..." based on the nodes in a concatenated string, right? Or at least f-strings.
What about excluding strings that have quote marks? Are you relying on the python-side post processing with isidentifier() to exclude that?
Comment on lines
+261
to
+262
| if !text.contains(|c: char| c.is_ascii_whitespace() || c == '\\') | ||
| && !self.is_pragma_ignored_recursive(node) |
There was a problem hiding this comment.
I think this would be the place to exclude strings with quote marks or any other expressions we might want to add on the rust side. (See my other comment) Right?
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.
As reported in #20324, the Rust-based Python import parser does not handle certain valid source patterns including concatenated strings.
Fix the Rust-based parser to handle concatenated strings correctly. Strings are parsed out of
Nodes via the newextract_stringhelper. Theinsert_importfunction is refactored to avoid double parsing of strings.Added some tests as well for concatenated strings.