fix(rome_js_formatter): Parity with prettier for many function argume…

…nts rome#4229
denbezrukov · Mar 4, 2023 · 5d20492 · 5d20492
1 parent 40f9c7d
commit 5d20492
Show file tree

Hide file tree

Showing 6 changed files with 237 additions and 84 deletions.
diff --git a/crates/rome_js_formatter/src/js/bindings/formal_parameter.rs b/crates/rome_js_formatter/src/js/bindings/formal_parameter.rs
@@ -3,8 +3,9 @@ use rome_formatter::write;
 
 use crate::utils::FormatInitializerClause;
 
+use crate::js::bindings::parameters::{should_hug_function_parameters, FormatAnyJsParameters};
+use rome_js_syntax::JsFormalParameter;
 use rome_js_syntax::JsFormalParameterFields;
-use rome_js_syntax::{AnyJsBindingPattern, JsFormalParameter};
 
 #[derive(Debug, Clone, Default)]
 pub(crate) struct FormatJsFormalParameter;
@@ -29,10 +30,18 @@ impl FormatNodeRule<JsFormalParameter> for FormatJsFormalParameter {
             ]
         });
 
-        if let AnyJsBindingPattern::JsObjectBindingPattern(_) = node.binding()? {
-            write![f, [group(&content)]]?;
-        } else {
+        let is_hug_parameter = node
+            .syntax()
+            .grand_parent()
+            .and_then(FormatAnyJsParameters::cast)
+            .map_or(false, |parameters| {
+                should_hug_function_parameters(&parameters, f.comments()).unwrap_or(false)
+            });
+
+        if is_hug_parameter {
             write![f, [content]]?;
+        } else {
+            write![f, [group(&content)]]?;
         }
 
         write![f, [FormatInitializerClause::new(initializer.as_ref())]]

diff --git a/crates/rome_js_formatter/src/ts/expressions/type_arguments.rs b/crates/rome_js_formatter/src/ts/expressions/type_arguments.rs
@@ -1,7 +1,7 @@
 use crate::utils::should_hug_type;
 use crate::{prelude::*, utils::is_object_like_type};
-use rome_formatter::write;
 use rome_formatter::FormatError::SyntaxError;
+use rome_formatter::{format_args, write};
 use rome_js_syntax::{
     AnyJsExpression, AnyTsType, JsSyntaxKind, JsVariableDeclarator, TsTypeArguments,
     TsTypeArgumentsFields,
@@ -75,17 +75,24 @@ impl FormatNodeRule<TsTypeArguments> for FormatTsTypeArguments {
         let should_inline = !is_arrow_function_variables
             && (ts_type_argument_list.len() == 0 || first_argument_can_be_hugged_or_is_null_type);
 
-        write!(f, [l_angle_token.format(),])?;
-
         if should_inline {
-            write!(f, [ts_type_argument_list.format()])?;
+            write!(
+                f,
+                [
+                    l_angle_token.format(),
+                    ts_type_argument_list.format(),
+                    r_angle_token.format()
+                ]
+            )
         } else {
             write!(
                 f,
-                [group(&soft_block_indent(&ts_type_argument_list.format()))]
-            )?;
+                [group(&format_args![
+                    l_angle_token.format(),
+                    soft_block_indent(&ts_type_argument_list.format()),
+                    r_angle_token.format()
+                ])]
+            )
         }
-
-        write!(f, [r_angle_token.format()])
     }
 }
diff --git a/crates/rome_js_formatter/tests/specs/ts/function/function_parameters.ts.snap b/crates/rome_js_formatter/tests/specs/ts/function/function_parameters.ts.snap
diff --git a/.../specs/ts/function/function_parameters.ts → ...unction/parameters/function_parameters.ts b/.../specs/ts/function/function_parameters.ts → ...unction/parameters/function_parameters.ts
@@ -17,3 +17,17 @@ export function formatNumber2(
 		useGrouping?: boolean;
 	}
 ): string {}
+
+
+export const findByDatefindByDatefindByDatefindByDate =
+	(_, { date }, { req } ) => findByDatefindByDatefindByDatefindByDate;
+
+export const queryAuditLog = async ({
+		startDate,
+		endDate,
+		jobId,
+		src,
+		type,
+	}: Filter): Promise<DBAuditLog[]> => {
+
+};
diff --git a/crates/rome_js_formatter/tests/specs/ts/function/parameters/function_parameters.ts.snap b/crates/rome_js_formatter/tests/specs/ts/function/parameters/function_parameters.ts.snap
@@ -0,0 +1,185 @@
+---
+source: crates/rome_formatter_test/src/snapshot_builder.rs
+info: ts/function/parameters/function_parameters.ts
+---
+
+# Input
+
+```ts
+export function formatNumber1(
+	value: string,
+	{
+		a,
+		b,
+		c,
+		formatNumber,
+		...props
+	}: Omit<NumberFormatterProps, 'value' | 'defaultFractionDigits'> & {
+		useGrouping?: boolean;
+	}
+): string {}
+
+export function formatNumber2(
+	value: string,
+	{ a }: Omit<NumberFormatterProps, 'value' | 'defaultFractionDigits'> & {
+		useGrouping?: boolean;
+	}
+): string {}
+
+
+export const findByDatefindByDatefindByDatefindByDate =
+	(_, { date }, { req } ) => findByDatefindByDatefindByDatefindByDate;
+
+export const queryAuditLog = async ({
+		startDate,
+		endDate,
+		jobId,
+		src,
+		type,
+	}: Filter): Promise<DBAuditLog[]> => {
+
+};
+
+```
+
+
+=============================
+
+# Outputs
+
+## Output 1
+
+-----
+Indent style: Tab
+Line width: 80
+Quote style: Double Quotes
+Quote properties: As needed
+Trailing comma: All
+Semicolons: Always
+-----
+
+```ts
+export function formatNumber1(
+	value: string,
+	{
+		a,
+		b,
+		c,
+		formatNumber,
+		...props
+	}: Omit<NumberFormatterProps, "value" | "defaultFractionDigits"> & {
+		useGrouping?: boolean;
+	},
+): string {}
+
+export function formatNumber2(
+	value: string,
+	{
+		a,
+	}: Omit<NumberFormatterProps, "value" | "defaultFractionDigits"> & {
+		useGrouping?: boolean;
+	},
+): string {}
+
+export const findByDatefindByDatefindByDatefindByDate = (
+	_,
+	{ date },
+	{ req },
+) => findByDatefindByDatefindByDatefindByDate;
+
+export const queryAuditLog = async ({
+	startDate,
+	endDate,
+	jobId,
+	src,
+	type,
+}: Filter): Promise<DBAuditLog[]> => {};
+```
+
+## Output 2
+
+-----
+Indent style: Tab
+Line width: 100
+Quote style: Double Quotes
+Quote properties: As needed
+Trailing comma: All
+Semicolons: Always
+-----
+
+```ts
+export function formatNumber1(
+	value: string,
+	{
+		a,
+		b,
+		c,
+		formatNumber,
+		...props
+	}: Omit<NumberFormatterProps, "value" | "defaultFractionDigits"> & {
+		useGrouping?: boolean;
+	},
+): string {}
+
+export function formatNumber2(
+	value: string,
+	{
+		a,
+	}: Omit<NumberFormatterProps, "value" | "defaultFractionDigits"> & {
+		useGrouping?: boolean;
+	},
+): string {}
+
+export const findByDatefindByDatefindByDatefindByDate = (_, { date }, { req }) =>
+	findByDatefindByDatefindByDatefindByDate;
+
+export const queryAuditLog = async ({
+	startDate,
+	endDate,
+	jobId,
+	src,
+	type,
+}: Filter): Promise<DBAuditLog[]> => {};
+```
+
+## Output 3
+
+-----
+Indent style: Tab
+Line width: 120
+Quote style: Double Quotes
+Quote properties: As needed
+Trailing comma: All
+Semicolons: Always
+-----
+
+```ts
+export function formatNumber1(
+	value: string,
+	{
+		a,
+		b,
+		c,
+		formatNumber,
+		...props
+	}: Omit<NumberFormatterProps, "value" | "defaultFractionDigits"> & {
+		useGrouping?: boolean;
+	},
+): string {}
+
+export function formatNumber2(
+	value: string,
+	{
+		a,
+	}: Omit<NumberFormatterProps, "value" | "defaultFractionDigits"> & {
+		useGrouping?: boolean;
+	},
+): string {}
+
+export const findByDatefindByDatefindByDatefindByDate = (_, { date }, { req }) =>
+	findByDatefindByDatefindByDatefindByDate;
+
+export const queryAuditLog = async ({ startDate, endDate, jobId, src, type }: Filter): Promise<DBAuditLog[]> => {};
+```
+
+
diff --git a/crates/rome_js_formatter/tests/specs/ts/function/parameters/options.json b/crates/rome_js_formatter/tests/specs/ts/function/parameters/options.json
@@ -0,0 +1,10 @@
+{
+	"cases": [
+		{
+			"line_width": 100
+		},
+		{
+			"line_width": 120
+		}
+	]
+}