Skip to content

[perflint] - Fix manual-list-comprehension for async generators (PERF401) #14551

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

Closed
diceroll123 wants to merge 2 commits into from
Closed

[perflint] - Fix manual-list-comprehension for async generators (PERF401) #14551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc4d338
[`perflint`] - Fix `manual-list-comprehension` for async generators (…
diceroll123 Nov 23, 2024
aafe95f
fix comment-related issue
diceroll123 Nov 23, 2024
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
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/rules/isort/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::Locator;
mod annotate;
pub(crate) mod block;
pub mod categorize;
mod comments;
pub mod comments;
mod format;
mod helpers;
mod normalize;
Expand Down
22 changes: 15 additions & 7 deletions crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ use ruff_text_size::{Ranged, TextRange};
#[derive(ViolationMetadata)]
pub(crate) struct ManualListComprehension {
is_async: bool,
comprehension_type: Option<ComprehensionType>,
comprehension_type: ComprehensionType,
}

impl Violation for ManualListComprehension {
Expand All @@ -67,14 +67,14 @@ impl Violation for ManualListComprehension {
comprehension_type,
} = self;
let message_str = match comprehension_type {
Some(ComprehensionType::Extend) => {
ComprehensionType::Extend => {
if *is_async {
"`list.extend` with an async comprehension"
} else {
"`list.extend`"
}
}
Some(ComprehensionType::ListComprehension) | None => {
ComprehensionType::ListComprehension => {
if *is_async {
"an async list comprehension"
} else {
Expand All @@ -86,7 +86,7 @@ impl Violation for ManualListComprehension {
}

fn fix_title(&self) -> Option<String> {
match self.comprehension_type? {
match self.comprehension_type {
ComprehensionType::ListComprehension => {
Some("Replace for loop with list comprehension".to_string())
}
Expand Down Expand Up @@ -319,7 +319,7 @@ pub(crate) fn manual_list_comprehension(checker: &mut Checker, for_stmt: &ast::S
let mut diagnostic = Diagnostic::new(
ManualListComprehension {
is_async: for_stmt.is_async,
comprehension_type: Some(comprehension_type),
comprehension_type,
},
*range,
);
Expand Down Expand Up @@ -430,7 +430,11 @@ fn convert_to_list_extend(
generator_str
};

let comprehension_body = format!("{variable_name}.extend({generator_str})");
let comprehension_body = if for_stmt.is_async {
format!("{variable_name}.extend([{generator_str}])")
} else {
format!("{variable_name}.extend({generator_str})")
};

let indentation = if for_loop_inline_comments.is_empty() {
String::new()
Expand All @@ -439,7 +443,11 @@ fn convert_to_list_extend(
};
let text_to_replace = format!(
"{}{indentation}{comprehension_body}",
for_loop_inline_comments.join(&indentation)
all_comments
.iter()
.map(|comment| comment.value.to_string())
.collect::<Vec<String>>()
.join(&indentation)
);
Ok(Fix::unsafe_edit(Edit::range_replacement(
text_to_replace,
Expand Down
Loading