Skip to content

fix(linter/no-single-promise-in-promise-methods): preserve array structure in fixer for Promise.all #17128

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

Merged
graphite-app merged 1 commit into from
Dec 19, 2025
Merged

fix(linter/no-single-promise-in-promise-methods): preserve array structure in fixer for Promise.all #17128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 25 additions & 9 deletions crates/oxc_linter/src/rules/unicorn/no_single_promise_in_promise_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,22 @@ impl Rule for NoSinglePromiseInPromiseMethods {

let diagnostic = no_single_promise_in_promise_methods_diagnostic(span, method_name);

let is_directly_in_await = ctx
let await_expr_span = ctx
.nodes()
// get first non-parenthesis parent node
.ancestor_kinds(node.id())
.ancestors(node.id())
.map(AstNode::kind)
.find(|kind| !is_ignorable_kind(kind))
// check if it's an `await ...` expression
.is_some_and(|kind| matches!(kind, AstKind::AwaitExpression(_)));
.and_then(|kind| {
if let AstKind::AwaitExpression(await_expr) = kind {
Some(await_expr.span)
} else {
None
}
});

if !is_directly_in_await && method_name == "all" {
if await_expr_span.is_none() && method_name == "all" {
return ctx.diagnostic(diagnostic);
}

Expand All @@ -110,8 +117,12 @@ impl Rule for NoSinglePromiseInPromiseMethods {
let elem_text = fixer.source_range(first.span());
let call_span = call_expr.span;

if is_directly_in_await {
fixer.replace(call_span, elem_text.to_owned())
if let Some(await_span) = await_expr_span {
if method_name == "all" {
fixer.replace(await_span, format!("[await {elem_text}]"))
} else {
fixer.replace(call_span, elem_text.to_owned())
}
} else {
fixer.replace(call_span, format!("Promise.resolve({elem_text})"))
}
Expand Down Expand Up @@ -253,9 +264,14 @@ fn test() {

let fix = vec![
("Promise.all([null]).then()", "Promise.all([null]).then()", None),
("await Promise.all([x]);", "await x;", None),
("await Promise.all([x as Promise<number>]);", "await x as Promise<number>;", None),
("while(true) { await Promise.all([x]); }", "while(true) { await x; }", None),
// Promise.all returns an array, so we preserve the array structure
// `await Promise.all([x])` -> `[await x]`
("await Promise.all([x]);", "[await x];", None),
("await Promise.all([x as Promise<number>]);", "[await x as Promise<number>];", None),
("while(true) { await Promise.all([x]); }", "while(true) { [await x]; }", None),
// Promise.any and Promise.race return a single value, not an array
("await Promise.any([x]);", "await x;", None),
("await Promise.race([x]);", "await x;", None),
("const foo = await Promise.all([x])", "const foo = await Promise.all([x])", None),
("const [foo] = await Promise.all([x])", "const [foo] = await Promise.all([x])", None),
("let foo; foo = await Promise.all([x])", "let foo; foo = await Promise.all([x])", None),
Expand Down
Loading