dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(prettier) Print function args correctly (#1395)

Browse source
This commit is contained in:
Cameron 2023-11-18 01:47:27 +00:00 committed by GitHub
parent 8828b93ba0
commit 39341e4688
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/oxc_prettier/src/format/call_expression.rs
View file

@ -2,7 +2,7 @@ use oxc_allocator::{Box, Vec};
#[allow(clippy::wildcard_imports)]
use oxc_ast::ast::*;
use crate::{doc::Doc, ss, Format, Prettier};
use crate::{doc::Doc, if_break, ss, Format, Prettier};
pub(super) fn print_call_expression<'a>(
p: &mut Prettier<'a>,
@ -17,8 +17,31 @@ pub(super) fn print_call_expression<'a>(
parts.push(ss!("new "));
}
parts.push(callee.format(p));
parts.push(ss!("("));
parts.extend(arguments.iter().map(|arg| arg.format(p)));
parts.push(ss!(")"));
parts.push(print_call_expression_arguments(p, arguments));
Doc::Array(parts)
}
fn print_call_expression_arguments<'a>(
p: &mut Prettier<'a>,
arguments: &Vec<'a, Argument<'a>>,
) -> Doc<'a> {
let mut parts = p.vec();
parts.push(ss!("("));
let mut parts_inner = p.vec();
parts_inner.push(Doc::Softline);
for (i, element) in arguments.iter().enumerate() {
parts_inner.push(element.format(p));
if i < arguments.len() - 1 {
parts_inner.push(ss!(","));
parts_inner.push(Doc::Line);
}
}
parts.push(Doc::Indent(parts_inner));
parts.push(if_break!(p, ","));
parts.push(Doc::Softline);
parts.push(ss!(")"));
Doc::Group(parts)
}

16
tasks/prettier_conformance/prettier.snap.md
View file

@ -1,4 +1,4 @@
Compatibility: 66/881 (7.49%)
Compatibility: 78/881 (8.85%)
# Failed
@ -41,7 +41,6 @@ Compatibility: 66/881 (7.49%)
* arrows/currying.js
* arrows/issue-1389-curry.js
* arrows/issue-4166-curry.js
* arrows/long-call-no-args.js
* arrows/long-contents.js
* arrows/parens.js
* arrows/tuple-and-record.js
@ -100,7 +99,6 @@ Compatibility: 66/881 (7.49%)
* async/inline-await.js
* async/nested.js
* async/nested2.js
* async/simple-nested-await.js
### async-do-expressions
* async-do-expressions/async-do-expressions.js
@ -190,7 +188,6 @@ Compatibility: 66/881 (7.49%)
### call/first-argument-expansion
* call/first-argument-expansion/expression-2nd-arg.js
* call/first-argument-expansion/issue-12892.js
* call/first-argument-expansion/issue-13237.js
* call/first-argument-expansion/issue-14454.js
* call/first-argument-expansion/issue-2456.js
@ -338,7 +335,6 @@ Compatibility: 66/881 (7.49%)
### conditional
* conditional/comments.js
* conditional/new-expression.js
* conditional/new-ternary-examples.js
* conditional/new-ternary-spec.js
* conditional/no-confusing-arrow.js
@ -665,7 +661,6 @@ Compatibility: 66/881 (7.49%)
* last-argument-expansion/empty-lines.js
* last-argument-expansion/empty-object.js
* last-argument-expansion/function-body-in-mode-break.js
* last-argument-expansion/function-expression-issue-2239.js
* last-argument-expansion/function-expression.js
* last-argument-expansion/issue-10708.js
* last-argument-expansion/issue-7518.js
@ -696,11 +691,9 @@ Compatibility: 66/881 (7.49%)
* method-chain/break-last-call.js
* method-chain/break-last-member.js
* method-chain/comment.js
* method-chain/complex-args.js
* method-chain/computed-merge.js
* method-chain/computed.js
* method-chain/conditional.js
* method-chain/cypress.js
* method-chain/d3.js
* method-chain/first_long.js
* method-chain/fluent-configuration.js
@ -714,16 +707,11 @@ Compatibility: 66/881 (7.49%)
* method-chain/object-literal.js
* method-chain/pr-7889.js
* method-chain/short-names.js
* method-chain/simple-args.js
* method-chain/square_0.js
* method-chain/test.js
* method-chain/this.js
* method-chain/tuple-and-record.js
### method-chain/print-width-120
* method-chain/print-width-120/constructor.js
* method-chain/print-width-120/issue-7884.js
### module-blocks
* module-blocks/comments.js
* module-blocks/module-blocks.js
@ -954,7 +942,6 @@ Compatibility: 66/881 (7.49%)
### require-amd
* require-amd/named-amd-module.js
* require-amd/non-amd-define.js
* require-amd/require.js
### reserved-word
@ -982,7 +969,6 @@ Compatibility: 66/881 (7.49%)
### source-phase-imports
* source-phase-imports/default-binding.js
* source-phase-imports/import-source-attributes-declaration.js
* source-phase-imports/import-source-attributes-expression.js
* source-phase-imports/import-source-binding-from.js
* source-phase-imports/import-source-binding-source.js
* source-phase-imports/import-source.js