[flake8-comprehensions]: Handle trailing comma in C403 fix#16110
Merged
dylwil3 merged 4 commits intoastral-sh:mainfrom Feb 15, 2025
Merged
[flake8-comprehensions]: Handle trailing comma in C403 fix#16110dylwil3 merged 4 commits intoastral-sh:mainfrom
flake8-comprehensions]: Handle trailing comma in C403 fix#16110dylwil3 merged 4 commits intoastral-sh:mainfrom
Conversation
Contributor
|
ntBre
added
bug
ayushbaweja
changed the title
dhruvmanila
reviewed
Feb 12, 2025
Comment on lines
74
to
82
| // Place `}` at argument's end or at trailing comma if present | ||
| let mut tokenizer = SimpleTokenizer::starts_at( | ||
| argument.end(), | ||
| checker.locator().slice(TextRange::up_to(call.end())), | ||
| ); | ||
| let right_brace_loc = tokenizer | ||
| .find(|token| token.kind == SimpleTokenKind::Comma) | ||
| .map_or(call.arguments.end() - one, |comma| { | ||
| comma.end() - TextSize::from(1) | ||
| }); | ||
|
|
Member
There was a problem hiding this comment.
I think we should use checker.tokens().in_range(...) here as we already have access to the parsed tokens. I think the range would be TextRange::new(argument.end(), call.end()). You can refer to other references of in_range method to check how it's being used.
Collaborator
There was a problem hiding this comment.
Good call @dhruvmanila ! Do you (@ayushbaweja) want to also make the same changes to unnecessary_generator_list.rs and unnecessary_generator_set.rs? Here's the patch for the first of those, for example:
diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
index cc389e1f4..2e3b7fbc9 100644
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
@@ -4,7 +4,7 @@ use ruff_python_ast as ast;
use ruff_python_ast::comparable::ComparableExpr;
use ruff_python_ast::parenthesize::parenthesized_range;
use ruff_python_ast::ExprGenerator;
-use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
+use ruff_python_parser::TokenKind;
use ruff_text_size::{Ranged, TextRange, TextSize};
use crate::checkers::ast::Checker;
@@ -125,10 +125,12 @@ pub(crate) fn unnecessary_generator_list(checker: &Checker, call: &ast::ExprCall
// Replace `)` with `]`.
// Place `]` at argument's end or at trailing comma if present
- let mut tokenizer =
- SimpleTokenizer::new(checker.source(), TextRange::new(argument.end(), call.end()));
- let right_bracket_loc = tokenizer
- .find(|token| token.kind == SimpleTokenKind::Comma)
+ let after_arg_tokens = checker
+ .tokens()
+ .in_range(TextRange::new(argument.end(), call.end()));
+ let right_bracket_loc = after_arg_tokens
+ .iter()
+ .find(|token| token.kind() == TokenKind::Comma)
.map_or(call.arguments.end(), |comma| comma.end())
- TextSize::from(1);
let call_end = Edit::replacement("]".to_string(), right_bracket_loc, call.end());
Contributor
Author
There was a problem hiding this comment.
Sure! Will make the change and also update the unnecessary_generator files
dylwil3
force-pushed
the
fix-c403-trailing-comma
branch
from
fcd1884 to
4dfd52d
Compare
dylwil3
approved these changes
Feb 15, 2025
Collaborator
dylwil3
left a comment
dylwil3
left a comment
There was a problem hiding this comment.
Thanks so much, this is great!
dylwil3
changed the title
flake8-comprehensions]: Handle trailing comma in C403 fix
dhruvmanila
added a commit
that referenced
this pull request
Feb 24, 2025
## Summary This is mainly on me for not noticing this during the last release but I noticed in the last changelog that there's only 1 bug fix which didn't seem correct as I saw multiple of them so I looked at a couple of PRs that are in "Rule changes" section and the PRs that were marked with the `bug` label was categorized there because 1. It _also_ had other labels like `rule` and `fixes` (#16080, #16110, #16219, etc.) 2. Some PRs didn't have the `bug` label (but the issue as marked as `bug`) but _only_ labels like "fixes" (#16011, #16132, etc.)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Resolves #16099 based on #15929
Test Plan
Added test case
s = set([x for x in range(3)],)and updated snapshot.