From 9e3aaacf2d3ab7f87ab3a577ef35da2cf624fed5 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Tue, 31 May 2022 09:28:41 +0100 Subject: [PATCH] feat(rome_formatter): make formatter language aware (#2629) --- .../rome_formatter/src/format_extensions.rs | 104 +++++++++--------- crates/rome_formatter/src/formatter.rs | 19 ++-- crates/rome_formatter/src/lib.rs | 88 +++++++-------- crates/rome_formatter/src/macros.rs | 16 +-- .../rome_js_formatter/src/check_reformat.rs | 6 +- .../src/{options.rs => context.rs} | 48 +++++++- crates/rome_js_formatter/src/cst.rs | 6 +- crates/rome_js_formatter/src/formatter.rs | 28 +++-- .../any/array_assignment_pattern_element.rs | 4 +- .../js/any/array_binding_pattern_element.rs | 4 +- .../src/js/any/array_element.rs | 4 +- .../src/js/any/arrow_function_parameters.rs | 4 +- .../src/js/any/assignment.rs | 4 +- .../src/js/any/assignment_pattern.rs | 4 +- .../rome_js_formatter/src/js/any/binding.rs | 4 +- .../src/js/any/binding_pattern.rs | 4 +- .../src/js/any/call_argument.rs | 4 +- crates/rome_js_formatter/src/js/any/class.rs | 4 +- .../src/js/any/class_member.rs | 4 +- .../src/js/any/class_member_name.rs | 4 +- .../src/js/any/constructor_parameter.rs | 4 +- .../src/js/any/declaration.rs | 4 +- .../src/js/any/declaration_clause.rs | 4 +- .../src/js/any/export_clause.rs | 4 +- .../src/js/any/export_default_declaration.rs | 4 +- .../src/js/any/export_named_specifier.rs | 4 +- .../src/js/any/expression.rs | 4 +- .../src/js/any/for_in_or_of_initializer.rs | 4 +- .../src/js/any/for_initializer.rs | 4 +- .../src/js/any/formal_parameter.rs | 4 +- .../rome_js_formatter/src/js/any/function.rs | 4 +- .../src/js/any/function_body.rs | 4 +- .../src/js/any/import_assertion_entry.rs | 4 +- .../src/js/any/import_clause.rs | 4 +- .../src/js/any/in_property.rs | 4 +- .../src/js/any/literal_expression.rs | 4 +- .../src/js/any/method_modifier.rs | 4 +- .../src/js/any/module_item.rs | 4 +- crates/rome_js_formatter/src/js/any/name.rs | 4 +- .../src/js/any/named_import.rs | 4 +- .../src/js/any/named_import_specifier.rs | 4 +- .../any/object_assignment_pattern_member.rs | 4 +- .../js/any/object_binding_pattern_member.rs | 4 +- .../src/js/any/object_member.rs | 4 +- .../src/js/any/object_member_name.rs | 4 +- .../rome_js_formatter/src/js/any/parameter.rs | 4 +- .../src/js/any/property_modifier.rs | 4 +- crates/rome_js_formatter/src/js/any/root.rs | 4 +- .../rome_js_formatter/src/js/any/statement.rs | 4 +- .../src/js/any/switch_clause.rs | 4 +- .../src/js/any/template_element.rs | 4 +- .../assignments/array_assignment_pattern.rs | 2 +- .../array_assignment_pattern_rest_element.rs | 2 +- .../js/assignments/assignment_with_default.rs | 2 +- .../assignments/computed_member_assignment.rs | 2 +- .../js/assignments/identifier_assignment.rs | 2 +- .../assignments/object_assignment_pattern.rs | 2 +- .../object_assignment_pattern_property.rs | 2 +- .../object_assignment_pattern_rest.rs | 2 +- ...t_assignment_pattern_shorthand_property.rs | 2 +- .../assignments/parenthesized_assignment.rs | 2 +- .../assignments/static_member_assignment.rs | 2 +- .../src/js/auxiliary/array_hole.rs | 2 +- .../src/js/auxiliary/case_clause.rs | 2 +- .../src/js/auxiliary/catch_clause.rs | 2 +- .../src/js/auxiliary/default_clause.rs | 2 +- .../src/js/auxiliary/directive.rs | 2 +- .../src/js/auxiliary/else_clause.rs | 2 +- .../src/js/auxiliary/expression_snipped.rs | 2 +- .../src/js/auxiliary/finally_clause.rs | 2 +- .../src/js/auxiliary/function_body.rs | 2 +- .../src/js/auxiliary/initializer_clause.rs | 2 +- .../src/js/auxiliary/module.rs | 2 +- .../src/js/auxiliary/name.rs | 2 +- .../src/js/auxiliary/new_target.rs | 2 +- .../src/js/auxiliary/private_name.rs | 2 +- .../src/js/auxiliary/reference_identifier.rs | 2 +- .../src/js/auxiliary/script.rs | 2 +- .../src/js/auxiliary/spread.rs | 2 +- .../src/js/auxiliary/static_modifier.rs | 2 +- .../auxiliary/variable_declaration_clause.rs | 2 +- .../src/js/auxiliary/variable_declarator.rs | 2 +- .../src/js/bindings/array_binding_pattern.rs | 2 +- .../array_binding_pattern_rest_element.rs | 2 +- .../bindings/binding_pattern_with_default.rs | 2 +- .../src/js/bindings/constructor_parameters.rs | 2 +- .../src/js/bindings/formal_parameter.rs | 2 +- .../src/js/bindings/identifier_binding.rs | 2 +- .../src/js/bindings/object_binding_pattern.rs | 2 +- .../object_binding_pattern_property.rs | 2 +- .../bindings/object_binding_pattern_rest.rs | 2 +- ...ject_binding_pattern_shorthand_property.rs | 2 +- .../src/js/bindings/parameters.rs | 2 +- .../src/js/bindings/rest_parameter.rs | 2 +- .../js/classes/constructor_class_member.rs | 2 +- .../src/js/classes/empty_class_member.rs | 2 +- .../src/js/classes/extends_clause.rs | 2 +- .../src/js/classes/getter_class_member.rs | 2 +- .../src/js/classes/method_class_member.rs | 2 +- .../src/js/classes/property_class_member.rs | 2 +- .../src/js/classes/setter_class_member.rs | 2 +- ...tatic_initialization_block_class_member.rs | 2 +- .../src/js/declarations/catch_declaration.rs | 2 +- .../src/js/declarations/class_declaration.rs | 2 +- .../class_export_default_declaration.rs | 2 +- .../declarations/for_variable_declaration.rs | 2 +- .../js/declarations/function_declaration.rs | 2 +- .../function_export_default_declaration.rs | 2 +- .../js/declarations/variable_declaration.rs | 2 +- .../src/js/expressions/array_expression.rs | 2 +- .../expressions/arrow_function_expression.rs | 2 +- .../js/expressions/assignment_expression.rs | 2 +- .../src/js/expressions/await_expression.rs | 2 +- .../expressions/big_int_literal_expression.rs | 2 +- .../src/js/expressions/binary_expression.rs | 2 +- .../expressions/boolean_literal_expression.rs | 2 +- .../src/js/expressions/call_arguments.rs | 2 +- .../src/js/expressions/call_expression.rs | 2 +- .../src/js/expressions/class_expression.rs | 2 +- .../expressions/computed_member_expression.rs | 2 +- .../js/expressions/conditional_expression.rs | 2 +- .../src/js/expressions/function_expression.rs | 2 +- .../js/expressions/identifier_expression.rs | 2 +- .../js/expressions/import_call_expression.rs | 2 +- .../src/js/expressions/in_expression.rs | 2 +- .../js/expressions/instanceof_expression.rs | 2 +- .../src/js/expressions/logical_expression.rs | 2 +- .../src/js/expressions/new_expression.rs | 2 +- .../js/expressions/null_literal_expression.rs | 2 +- .../expressions/number_literal_expression.rs | 2 +- .../src/js/expressions/object_expression.rs | 2 +- .../expressions/parenthesized_expression.rs | 2 +- .../js/expressions/post_update_expression.rs | 2 +- .../js/expressions/pre_update_expression.rs | 2 +- .../expressions/regex_literal_expression.rs | 2 +- .../src/js/expressions/sequence_expression.rs | 2 +- .../expressions/static_member_expression.rs | 2 +- .../expressions/string_literal_expression.rs | 2 +- .../src/js/expressions/super_expression.rs | 2 +- .../src/js/expressions/template.rs | 2 +- .../js/expressions/template_chunk_element.rs | 2 +- .../src/js/expressions/template_element.rs | 2 +- .../src/js/expressions/this_expression.rs | 2 +- .../src/js/expressions/unary_expression.rs | 2 +- .../src/js/expressions/yield_argument.rs | 2 +- .../src/js/expressions/yield_expression.rs | 2 +- .../array_assignment_pattern_element_list.rs | 4 +- .../array_binding_pattern_element_list.rs | 4 +- .../src/js/lists/array_element_list.rs | 6 +- .../src/js/lists/call_argument_list.rs | 4 +- .../src/js/lists/class_member_list.rs | 4 +- .../src/js/lists/constructor_modifier_list.rs | 4 +- .../js/lists/constructor_parameter_list.rs | 4 +- .../src/js/lists/directive_list.rs | 4 +- .../lists/export_named_from_specifier_list.rs | 4 +- .../js/lists/export_named_specifier_list.rs | 4 +- .../js/lists/import_assertion_entry_list.rs | 4 +- .../src/js/lists/method_modifier_list.rs | 4 +- .../src/js/lists/module_item_list.rs | 4 +- .../js/lists/named_import_specifier_list.rs | 4 +- ...object_assignment_pattern_property_list.rs | 4 +- .../object_binding_pattern_property_list.rs | 4 +- .../src/js/lists/object_member_list.rs | 4 +- .../src/js/lists/parameter_list.rs | 4 +- .../src/js/lists/property_modifier_list.rs | 4 +- .../src/js/lists/statement_list.rs | 4 +- .../src/js/lists/switch_case_list.rs | 4 +- .../src/js/lists/template_element_list.rs | 4 +- .../src/js/lists/variable_declarator_list.rs | 4 +- .../src/js/module/default_import_specifier.rs | 2 +- .../rome_js_formatter/src/js/module/export.rs | 2 +- .../src/js/module/export_as_clause.rs | 2 +- .../export_default_declaration_clause.rs | 2 +- .../export_default_expression_clause.rs | 2 +- .../src/js/module/export_from_clause.rs | 2 +- .../src/js/module/export_named_clause.rs | 2 +- .../src/js/module/export_named_from_clause.rs | 2 +- .../js/module/export_named_from_specifier.rs | 2 +- .../export_named_shorthand_specifier.rs | 2 +- .../src/js/module/export_named_specifier.rs | 2 +- .../rome_js_formatter/src/js/module/import.rs | 2 +- .../src/js/module/import_assertion.rs | 2 +- .../src/js/module/import_assertion_entry.rs | 2 +- .../src/js/module/import_bare_clause.rs | 2 +- .../src/js/module/import_default_clause.rs | 2 +- .../src/js/module/import_meta.rs | 2 +- .../src/js/module/import_named_clause.rs | 2 +- .../src/js/module/import_namespace_clause.rs | 2 +- .../src/js/module/literal_export_name.rs | 2 +- .../src/js/module/module_source.rs | 2 +- .../src/js/module/named_import_specifier.rs | 2 +- .../src/js/module/named_import_specifiers.rs | 2 +- .../js/module/namespace_import_specifier.rs | 2 +- .../shorthand_named_import_specifier.rs | 2 +- .../src/js/objects/computed_member_name.rs | 2 +- .../src/js/objects/getter_object_member.rs | 2 +- .../src/js/objects/literal_member_name.rs | 2 +- .../src/js/objects/method_object_member.rs | 2 +- .../js/objects/private_class_member_name.rs | 2 +- .../src/js/objects/property_object_member.rs | 2 +- .../src/js/objects/setter_object_member.rs | 2 +- .../shorthand_property_object_member.rs | 2 +- .../src/js/statements/block_statement.rs | 2 +- .../src/js/statements/break_statement.rs | 2 +- .../src/js/statements/continue_statement.rs | 2 +- .../src/js/statements/debugger_statement.rs | 2 +- .../src/js/statements/do_while_statement.rs | 2 +- .../src/js/statements/empty_statement.rs | 2 +- .../src/js/statements/expression_statement.rs | 2 +- .../src/js/statements/for_in_statement.rs | 2 +- .../src/js/statements/for_of_statement.rs | 2 +- .../src/js/statements/for_statement.rs | 2 +- .../src/js/statements/if_statement.rs | 6 +- .../src/js/statements/labeled_statement.rs | 2 +- .../src/js/statements/return_statement.rs | 2 +- .../src/js/statements/switch_statement.rs | 2 +- .../src/js/statements/throw_statement.rs | 2 +- .../js/statements/try_finally_statement.rs | 2 +- .../src/js/statements/try_statement.rs | 2 +- .../src/js/statements/variable_statement.rs | 2 +- .../src/js/statements/while_statement.rs | 2 +- .../src/js/statements/with_statement.rs | 2 +- .../src/js/unknown/unknown.rs | 2 +- .../src/js/unknown/unknown_assignment.rs | 2 +- .../src/js/unknown/unknown_binding.rs | 2 +- .../src/js/unknown/unknown_expression.rs | 2 +- .../unknown/unknown_import_assertion_entry.rs | 2 +- .../src/js/unknown/unknown_member.rs | 2 +- .../unknown/unknown_named_import_specifier.rs | 2 +- .../src/js/unknown/unknown_parameter.rs | 2 +- .../src/js/unknown/unknown_statement.rs | 2 +- .../src/jsx/any/attribute.rs | 4 +- .../src/jsx/any/attribute_name.rs | 4 +- .../src/jsx/any/attribute_value.rs | 4 +- crates/rome_js_formatter/src/jsx/any/child.rs | 4 +- .../src/jsx/any/element_name.rs | 4 +- crates/rome_js_formatter/src/jsx/any/name.rs | 4 +- .../src/jsx/any/object_name.rs | 4 +- crates/rome_js_formatter/src/jsx/any/tag.rs | 4 +- .../src/jsx/attribute/attribute.rs | 2 +- .../attribute/attribute_initializer_clause.rs | 2 +- .../attribute/expression_attribute_value.rs | 2 +- .../src/jsx/attribute/spread_attribute.rs | 2 +- .../src/jsx/auxiliary/expression_child.rs | 2 +- .../src/jsx/auxiliary/name.rs | 2 +- .../src/jsx/auxiliary/namespace_name.rs | 2 +- .../src/jsx/auxiliary/reference_identifier.rs | 2 +- .../src/jsx/auxiliary/spread_child.rs | 2 +- .../src/jsx/auxiliary/string.rs | 2 +- .../src/jsx/auxiliary/text.rs | 2 +- .../src/jsx/expressions/tag_expression.rs | 2 +- .../src/jsx/lists/attribute_list.rs | 4 +- .../src/jsx/lists/child_list.rs | 4 +- .../src/jsx/objects/member_name.rs | 2 +- .../src/jsx/tag/closing_element.rs | 2 +- .../src/jsx/tag/closing_fragment.rs | 2 +- .../rome_js_formatter/src/jsx/tag/element.rs | 2 +- .../rome_js_formatter/src/jsx/tag/fragment.rs | 2 +- .../src/jsx/tag/opening_element.rs | 2 +- .../src/jsx/tag/opening_fragment.rs | 2 +- .../src/jsx/tag/self_closing_element.rs | 2 +- crates/rome_js_formatter/src/lib.rs | 58 +++++----- crates/rome_js_formatter/src/prelude.rs | 2 +- .../any/external_module_declaration_body.rs | 4 +- .../src/ts/any/index_signature_modifier.rs | 4 +- .../src/ts/any/method_signature_modifier.rs | 4 +- .../src/ts/any/module_name.rs | 4 +- .../src/ts/any/module_reference.rs | 4 +- crates/rome_js_formatter/src/ts/any/name.rs | 4 +- .../src/ts/any/property_annotation.rs | 4 +- .../src/ts/any/property_parameter_modifier.rs | 4 +- .../ts/any/property_signature_annotation.rs | 4 +- .../src/ts/any/property_signature_modifier.rs | 4 +- .../src/ts/any/return_type.rs | 4 +- .../src/ts/any/template_element.rs | 4 +- .../rome_js_formatter/src/ts/any/ts_type.rs | 4 +- .../src/ts/any/tuple_type_element.rs | 4 +- .../src/ts/any/type_member.rs | 4 +- .../ts/any/type_predicate_parameter_name.rs | 4 +- .../src/ts/any/variable_annotation.rs | 4 +- .../src/ts/assignments/as_assignment.rs | 2 +- .../non_null_assertion_assignment.rs | 2 +- .../assignments/type_assertion_assignment.rs | 2 +- .../src/ts/auxiliary/abstract_modifier.rs | 2 +- .../ts/auxiliary/accessibility_modifier.rs | 2 +- .../src/ts/auxiliary/asserts_condition.rs | 2 +- .../auxiliary/call_signature_type_member.rs | 2 +- .../construct_signature_type_member.rs | 2 +- .../src/ts/auxiliary/declare_modifier.rs | 2 +- .../src/ts/auxiliary/default_type_clause.rs | 2 +- .../auxiliary/definite_property_annotation.rs | 2 +- .../auxiliary/definite_variable_annotation.rs | 2 +- .../empty_external_module_declaration_body.rs | 2 +- .../src/ts/auxiliary/enum_member.rs | 2 +- .../ts/auxiliary/external_module_reference.rs | 2 +- .../auxiliary/getter_signature_type_member.rs | 2 +- .../src/ts/auxiliary/implements_clause.rs | 2 +- .../auxiliary/index_signature_type_member.rs | 2 +- .../src/ts/auxiliary/mapped_type_as_clause.rs | 2 +- .../mapped_type_optional_modifier_clause.rs | 2 +- .../mapped_type_readonly_modifier_clause.rs | 2 +- .../auxiliary/method_signature_type_member.rs | 2 +- .../src/ts/auxiliary/module_block.rs | 2 +- .../ts/auxiliary/named_tuple_type_element.rs | 2 +- .../auxiliary/optional_property_annotation.rs | 2 +- .../auxiliary/optional_tuple_type_element.rs | 2 +- .../src/ts/auxiliary/override_modifier.rs | 2 +- .../property_signature_type_member.rs | 2 +- .../src/ts/auxiliary/qualified_module_name.rs | 2 +- .../src/ts/auxiliary/qualified_name.rs | 2 +- .../src/ts/auxiliary/readonly_modifier.rs | 2 +- .../ts/auxiliary/rest_tuple_type_element.rs | 2 +- .../ts/auxiliary/return_type_annotation.rs | 2 +- .../auxiliary/setter_signature_type_member.rs | 2 +- .../src/ts/auxiliary/type_annotation.rs | 2 +- .../ts/auxiliary/type_constraint_clause.rs | 2 +- .../src/ts/auxiliary/type_parameter_name.rs | 2 +- .../src/ts/bindings/identifier_binding.rs | 2 +- .../ts/bindings/index_signature_parameter.rs | 2 +- .../src/ts/bindings/property_parameter.rs | 2 +- .../src/ts/bindings/this_parameter.rs | 2 +- .../src/ts/bindings/type_parameter.rs | 2 +- .../src/ts/bindings/type_parameters.rs | 2 +- .../constructor_signature_class_member.rs | 2 +- .../src/ts/classes/extends_clause.rs | 2 +- .../classes/getter_signature_class_member.rs | 2 +- .../classes/index_signature_class_member.rs | 2 +- .../classes/method_signature_class_member.rs | 2 +- .../property_signature_class_member.rs | 2 +- .../classes/setter_signature_class_member.rs | 2 +- .../declare_function_declaration.rs | 2 +- .../src/ts/declarations/enum_declaration.rs | 2 +- .../external_module_declaration.rs | 2 +- .../src/ts/declarations/global_declaration.rs | 2 +- .../declarations/import_equals_declaration.rs | 2 +- .../ts/declarations/interface_declaration.rs | 2 +- .../src/ts/declarations/module_declaration.rs | 2 +- .../ts/declarations/type_alias_declaration.rs | 2 +- .../src/ts/expressions/as_expression.rs | 2 +- .../expressions/name_with_type_arguments.rs | 2 +- .../non_null_assertion_expression.rs | 2 +- .../ts/expressions/template_chunk_element.rs | 2 +- .../src/ts/expressions/template_element.rs | 2 +- .../ts/expressions/template_literal_type.rs | 2 +- .../src/ts/expressions/type_arguments.rs | 2 +- .../expressions/type_assertion_expression.rs | 2 +- .../src/ts/lists/enum_member_list.rs | 4 +- .../ts/lists/index_signature_modifier_list.rs | 4 +- .../lists/intersection_type_element_list.rs | 4 +- .../lists/method_signature_modifier_list.rs | 4 +- .../lists/property_parameter_modifier_list.rs | 4 +- .../lists/property_signature_modifier_list.rs | 4 +- .../src/ts/lists/template_element_list.rs | 4 +- .../src/ts/lists/tuple_type_element_list.rs | 4 +- .../src/ts/lists/type_argument_list.rs | 4 +- .../src/ts/lists/type_list.rs | 4 +- .../src/ts/lists/type_member_list.rs | 4 +- .../src/ts/lists/type_parameter_list.rs | 4 +- .../src/ts/lists/union_type_variant_list.rs | 4 +- .../ts/module/export_as_namespace_clause.rs | 2 +- .../src/ts/module/export_assignment_clause.rs | 2 +- .../src/ts/module/export_declare_clause.rs | 2 +- .../src/ts/module/import_type.rs | 2 +- .../src/ts/module/import_type_qualifier.rs | 2 +- .../src/ts/statements/declare_statement.rs | 2 +- .../src/ts/types/any_type.rs | 2 +- .../src/ts/types/array_type.rs | 2 +- .../src/ts/types/asserts_return_type.rs | 2 +- .../src/ts/types/big_int_literal_type.rs | 2 +- .../src/ts/types/bigint_type.rs | 2 +- .../src/ts/types/boolean_literal_type.rs | 2 +- .../src/ts/types/boolean_type.rs | 2 +- .../src/ts/types/conditional_type.rs | 2 +- .../src/ts/types/constructor_type.rs | 2 +- .../src/ts/types/function_type.rs | 2 +- .../src/ts/types/indexed_access_type.rs | 2 +- .../src/ts/types/infer_type.rs | 2 +- .../src/ts/types/intersection_type.rs | 2 +- .../src/ts/types/mapped_type.rs | 2 +- .../src/ts/types/never_type.rs | 2 +- .../src/ts/types/non_primitive_type.rs | 2 +- .../src/ts/types/null_literal_type.rs | 2 +- .../src/ts/types/number_literal_type.rs | 2 +- .../src/ts/types/number_type.rs | 2 +- .../src/ts/types/object_type.rs | 2 +- .../src/ts/types/parenthesized_type.rs | 2 +- .../src/ts/types/predicate_return_type.rs | 2 +- .../src/ts/types/reference_type.rs | 2 +- .../src/ts/types/string_literal_type.rs | 2 +- .../src/ts/types/string_type.rs | 2 +- .../src/ts/types/symbol_type.rs | 2 +- .../src/ts/types/this_type.rs | 2 +- .../src/ts/types/tuple_type.rs | 2 +- .../src/ts/types/type_operator_type.rs | 2 +- .../src/ts/types/typeof_type.rs | 2 +- .../src/ts/types/undefined_type.rs | 2 +- .../src/ts/types/union_type.rs | 2 +- .../src/ts/types/unknown_type.rs | 2 +- .../src/ts/types/void_type.rs | 2 +- crates/rome_js_formatter/src/utils/array.rs | 2 +- .../src/utils/binary_like_expression.rs | 16 +-- .../src/utils/format_conditional.rs | 12 +- .../src/utils/member_chain/groups.rs | 8 +- .../src/utils/member_chain/mod.rs | 6 +- crates/rome_js_formatter/src/utils/mod.rs | 22 ++-- .../rome_js_formatter/tests/check_reformat.rs | 6 +- .../rome_js_formatter/tests/prettier_tests.rs | 16 +-- crates/rome_js_formatter/tests/spec_test.rs | 46 ++++---- crates/rome_js_syntax/src/source_type.rs | 2 +- crates/rome_lsp/src/config.rs | 2 +- .../src/file_handlers/javascript.rs | 36 +++--- crates/rome_service/src/settings.rs | 15 ++- website/playground/src/lib.rs | 11 +- xtask/bench/src/features/formatter.rs | 4 +- xtask/bench/src/lib.rs | 12 +- xtask/codegen/src/formatter.rs | 14 +-- xtask/coverage/src/js/test262.rs | 3 +- xtask/coverage/src/jsx/jsx_babel.rs | 6 +- xtask/coverage/src/runner.rs | 2 +- xtask/coverage/src/ts/ts_babel.rs | 6 +- 420 files changed, 830 insertions(+), 788 deletions(-) rename crates/rome_js_formatter/src/{options.rs => context.rs} (67%) diff --git a/crates/rome_formatter/src/format_extensions.rs b/crates/rome_formatter/src/format_extensions.rs index e92615a0813..bda64ddfc4a 100644 --- a/crates/rome_formatter/src/format_extensions.rs +++ b/crates/rome_formatter/src/format_extensions.rs @@ -9,7 +9,7 @@ use rome_rowan::SyntaxResult; /// In order to take advantage of all the functions, you only need to implement the [FormatOptionalTokenAndNode::with_or] /// function. pub trait FormatOptional { - type Options; + type Context; /// This function tries to format an optional object. If the object is [None] /// an [empty token](crate::FormatElement::Empty) is created. If exists, the utility @@ -24,9 +24,9 @@ pub trait FormatOptional { /// struct MyFormat; /// /// impl Format for MyFormat { - /// type Options = (); + /// type Context = (); /// - /// fn format(&self, formatter: &Formatter) -> FormatResult { + /// fn format(&self, formatter: &Formatter) -> FormatResult { /// Ok(token("MyToken")) /// } /// } @@ -46,10 +46,10 @@ pub trait FormatOptional { fn with_or_empty( &self, with: With, - ) -> FormatWithOr FormatElement, WithResult, FormatElement, Self::Options> + ) -> FormatWithOr FormatElement, WithResult, FormatElement, Self::Context> where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, { self.with_or(with, empty_element) } @@ -66,8 +66,8 @@ pub trait FormatOptional { /// struct MyFormat; /// /// impl Format for MyFormat { - /// type Options = (); - /// fn format(&self, formatter: &Formatter) -> FormatResult { + /// type Context = (); + /// fn format(&self, formatter: &Formatter) -> FormatResult { /// Ok(token("MyToken")) /// } /// } @@ -77,10 +77,10 @@ pub trait FormatOptional { /// let result = none_token.or_format(|| token(" other result")); /// /// assert_eq!(Ok(token(" other result")), formatted![&formatter, [result]]); - fn or_format(&self, op: Or) -> OrFormat + fn or_format(&self, op: Or) -> OrFormat where Or: Fn() -> OrResult, - OrResult: IntoFormatElement, + OrResult: IntoFormatElement, { self.with_or(|token| token, op) } @@ -100,8 +100,8 @@ pub trait FormatOptional { /// struct MyFormat; /// /// impl Format for MyFormat { - /// type Options = (); - /// fn format(&self, formatter: &Formatter) -> FormatResult { + /// type Context = (); + /// fn format(&self, formatter: &Formatter) -> FormatResult { /// Ok(token("MyToken")) /// } /// } @@ -125,12 +125,12 @@ pub trait FormatOptional { &self, with: With, op: Or, - ) -> FormatWithOr + ) -> FormatWithOr where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, Or: Fn() -> OrResult, - OrResult: IntoFormatElement; + OrResult: IntoFormatElement; } /// Utility trait for formatting a formattable object with some additional content. @@ -151,8 +151,8 @@ pub trait FormatWith: Format { /// struct MyFormat; /// /// impl Format for MyFormat { - /// type Options = (); - /// fn format(&self, formatter: &Formatter) -> FormatResult { + /// type Context = (); + /// fn format(&self, formatter: &Formatter) -> FormatResult { /// Ok(token("MyToken")) /// } /// } @@ -164,29 +164,29 @@ pub trait FormatWith: Format { /// }); /// /// assert_eq!(formatted![&formatter, [token("MyToken"), space_token(), token("+")]], formatted![&formatter, [result]]) - fn with(&self, with: With) -> FormatItemWith + fn with(&self, with: With) -> FormatItemWith where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement; + WithResult: IntoFormatElement; } -pub struct FormatItemWith<'a, With, WithResult, Options> +pub struct FormatItemWith<'a, With, WithResult, Context> where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, { with: With, - inner: &'a dyn Format, + inner: &'a dyn Format, } -impl<'a, With, WithResult, Options> Format for FormatItemWith<'a, With, WithResult, Options> +impl<'a, With, WithResult, Context> Format for FormatItemWith<'a, With, WithResult, Context> where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, { - type Options = Options; + type Context = Context; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { let element = self.inner.format(formatter)?; (self.with)(element).into_format_element(formatter) @@ -194,28 +194,28 @@ where } impl FormatWith for F { - fn with(&self, with: With) -> FormatItemWith + fn with(&self, with: With) -> FormatItemWith where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, { FormatItemWith { with, inner: self } } } impl FormatOptional for SyntaxResult> { - type Options = F::Options; + type Context = F::Context; fn with_or( &self, with: With, op: Or, - ) -> FormatWithOr + ) -> FormatWithOr where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, Or: Fn() -> OrResult, - OrResult: IntoFormatElement, + OrResult: IntoFormatElement, { match self { Err(_) => FormatWithOr::With { inner: self, with }, @@ -226,18 +226,18 @@ impl FormatOptional for SyntaxResult> { } impl FormatOptional for Option { - type Options = F::Options; + type Context = F::Context; fn with_or( &self, with: With, op: Or, - ) -> FormatWithOr + ) -> FormatWithOr where With: Fn(FormatElement) -> WithResult, - WithResult: IntoFormatElement, + WithResult: IntoFormatElement, Or: Fn() -> OrResult, - OrResult: IntoFormatElement, + OrResult: IntoFormatElement, { match self { None => FormatWithOr::Or(op), @@ -246,35 +246,35 @@ impl FormatOptional for Option { } } -pub type OrFormat<'a, Or, OrResult, Options> = - FormatWithOr<'a, fn(FormatElement) -> FormatElement, Or, FormatElement, OrResult, Options>; +pub type OrFormat<'a, Or, OrResult, Context> = + FormatWithOr<'a, fn(FormatElement) -> FormatElement, Or, FormatElement, OrResult, Context>; -pub enum FormatWithOr<'a, With, Or, WithResult, OrResult, Options> +pub enum FormatWithOr<'a, With, Or, WithResult, OrResult, Context> where With: Fn(FormatElement) -> WithResult, Or: Fn() -> OrResult, - WithResult: IntoFormatElement, - OrResult: IntoFormatElement, + WithResult: IntoFormatElement, + OrResult: IntoFormatElement, { With { - inner: &'a dyn Format, + inner: &'a dyn Format, with: With, }, Or(Or), } -impl<'a, With, Or, WithResult, OrResult, Options> Format - for FormatWithOr<'a, With, Or, WithResult, OrResult, Options> +impl<'a, With, Or, WithResult, OrResult, Context> Format + for FormatWithOr<'a, With, Or, WithResult, OrResult, Context> where With: Fn(FormatElement) -> WithResult, Or: Fn() -> OrResult, - WithResult: IntoFormatElement, - OrResult: IntoFormatElement, + WithResult: IntoFormatElement, + OrResult: IntoFormatElement, { - type Options = Options; + type Context = Context; #[inline] - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { match self { FormatWithOr::Or(op) => op().into_format_element(formatter), FormatWithOr::With { inner, with } => { @@ -293,7 +293,7 @@ pub trait MemoizeFormat { /// /// ``` /// use std::cell::Cell; - /// use rome_formatter::FormatOptions; + /// use rome_formatter::FormatContext; /// use rome_formatter::prelude::*; /// use rome_rowan::TextSize; /// @@ -308,8 +308,8 @@ pub trait MemoizeFormat { /// } /// /// impl Format for MyFormat { - /// type Options = (); - /// fn format(&self, formatter: &Formatter) -> FormatResult { + /// type Context = (); + /// fn format(&self, formatter: &Formatter) -> FormatResult { /// let value = self.value.get(); /// self.value.set(value + 1); /// @@ -363,9 +363,9 @@ impl Format for Memoized where F: Format, { - type Options = F::Options; + type Context = F::Context; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { if let Some(memory) = self.memory.borrow().as_ref() { return memory.clone(); } diff --git a/crates/rome_formatter/src/formatter.rs b/crates/rome_formatter/src/formatter.rs index 16ba20d6f2a..78de68b631e 100644 --- a/crates/rome_formatter/src/formatter.rs +++ b/crates/rome_formatter/src/formatter.rs @@ -11,8 +11,9 @@ use std::cell::RefCell; /// The formatter is passed to the [Format] implementation of every node in the CST so that they /// can use it to format their children. #[derive(Default)] -pub struct Formatter { - options: Options, +pub struct Formatter { + /// Yields various information that belong to the current instance of the formatter + context: Context, group_id_builder: UniqueGroupIdBuilder, // This is using a RefCell as it only exists in debug mode, // the Formatter is still completely immutable in release builds @@ -20,11 +21,11 @@ pub struct Formatter { pub printed_tokens: RefCell, } -impl Formatter { +impl Formatter { /// Creates a new context that uses the given formatter options - pub fn new(options: Options) -> Self { + pub fn new(options: Context) -> Self { Self { - options, + context: options, group_id_builder: Default::default(), #[cfg(debug_assertions)] printed_tokens: Default::default(), @@ -32,8 +33,8 @@ impl Formatter { } /// Returns the [FormatOptions] specifying how to format the current CST - pub fn options(&self) -> &Options { - &self.options + pub fn context(&self) -> &Context { + &self.context } /// Creates a new group id that is unique to this document. The passed debug name is used in the @@ -70,7 +71,7 @@ impl Formatter { /// /// Returns the [Err] of the first item that failed to format. #[inline] - pub fn format_all>( + pub fn format_all>( &self, nodes: impl IntoIterator, ) -> FormatResult> { @@ -89,7 +90,7 @@ impl Formatter { } } -impl Formatter { +impl Formatter { /// Take a snapshot of the state of the formatter #[inline] pub fn snapshot(&self) -> FormatterSnapshot { diff --git a/crates/rome_formatter/src/lib.rs b/crates/rome_formatter/src/lib.rs index ce5e4eb338e..502a8d49e6c 100644 --- a/crates/rome_formatter/src/lib.rs +++ b/crates/rome_formatter/src/lib.rs @@ -166,11 +166,11 @@ impl From for u16 { } } -/// Options configuring how an object gets formatted. +/// Context configuring how an object gets formatted. /// /// Defines the common formatting options. Implementations can define additional options that /// are specific to formatting a specific object. -pub trait FormatOptions { +pub trait FormatContext { /// The indent style. fn indent_style(&self) -> IndentStyle; @@ -337,16 +337,16 @@ impl From<&SyntaxError> for FormatError { /// Implementing `Format` for a custom struct /// /// ``` -/// use rome_formatter::{format, FormatOptions, IndentStyle, LineWidth}; +/// use rome_formatter::{format, FormatContext, IndentStyle, LineWidth}; /// use rome_formatter::prelude::*; /// use rome_rowan::TextSize; /// /// struct Paragraph(String); /// /// impl Format for Paragraph { -/// type Options = Options; +/// type Context = Context; /// -/// fn format(&self, formatter: &Formatter) -> FormatResult { +/// fn format(&self, formatter: &Formatter) -> FormatResult { /// formatted![ /// formatter, /// [ @@ -358,9 +358,9 @@ impl From<&SyntaxError> for FormatError { /// } /// } /// -/// struct Options; +/// struct Context; /// -/// impl FormatOptions for Options { +/// impl FormatContext for Context { /// fn indent_style(&self) -> IndentStyle { /// IndentStyle::Tab /// } @@ -375,25 +375,25 @@ impl From<&SyntaxError> for FormatError { /// } /// /// let paragraph = Paragraph(String::from("test")); -/// let printed = format(Options, ¶graph).unwrap().print(); +/// let printed = format(Context, ¶graph).unwrap().print(); /// /// assert_eq!("test\n", printed.as_code()) /// ``` pub trait Format { /// Type of the formatter options. - type Options; + type Context; /// Formats the object - fn format(&self, formatter: &Formatter) -> FormatResult; + fn format(&self, formatter: &Formatter) -> FormatResult; } impl Format for &T where T: ?Sized + Format, { - type Options = T::Options; + type Context = T::Context; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { Format::format(&**self, formatter) } } @@ -402,9 +402,9 @@ impl Format for &mut T where T: ?Sized + Format, { - type Options = T::Options; + type Context = T::Context; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { Format::format(&**self, formatter) } } @@ -413,9 +413,9 @@ impl Format for Option where T: Format, { - type Options = T::Options; + type Context = T::Context; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { match self { Some(value) => value.format(formatter), None => Ok(empty_element()), @@ -427,9 +427,9 @@ impl Format for SyntaxResult where T: Format, { - type Options = T::Options; + type Context = T::Context; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { match self { Ok(value) => value.format(formatter), Err(err) => Err(err.into()), @@ -461,7 +461,7 @@ impl IntoFormatElement for FormatResult { impl IntoFormatElement for T where - T: Format, + T: Format, { #[inline] fn into_format_element(self, formatter: &Formatter) -> FormatResult { @@ -480,9 +480,9 @@ where /// That's why the `rome_js_formatter` crate must define a new-type that implements the formatting /// of `JsIfStatement`. pub trait FormatRule { - type Options; + type Context; - fn format(item: &T, formatter: &Formatter) -> FormatResult; + fn format(item: &T, formatter: &Formatter) -> FormatResult; } /// Trait for an object that formats an object with a specified rule. @@ -500,9 +500,9 @@ pub trait FormatRule { /// /// ``` /// use rome_formatter::prelude::*; -/// use rome_formatter::{FormatOptions, FormatWithRule}; +/// use rome_formatter::{FormatContext, FormatWithRule}; /// use rome_rowan::{Language, SyntaxNode}; -/// fn format_node, Options=()>>(node: F) -> FormatResult { +/// fn format_node, Context=()>>(node: F) -> FormatResult { /// let formatter = Formatter::default(); /// /// let formatted = node.format(&formatter); @@ -555,10 +555,10 @@ impl Format for FormatRefWithRule<'_, T, R> where R: FormatRule, { - type Options = R::Options; + type Context = R::Context; #[inline] - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { R::format(self.item, formatter) } } @@ -597,10 +597,10 @@ impl Format for FormatOwnedWithRule where R: FormatRule, { - type Options = R::Options; + type Context = R::Context; #[inline] - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { R::format(&self.item, formatter) } } @@ -619,9 +619,9 @@ where /// Formats any value that implements [Format]. /// /// Please note that [format_node] is preferred to format a [JsSyntaxNode] -pub fn format( - options: O, - root: &dyn Format, +pub fn format( + options: C, + root: &dyn Format, ) -> FormatResult { tracing::trace_span!("format").in_scope(move || { let printer_options = options.as_print_options(); @@ -635,11 +635,11 @@ pub fn format( /// /// It returns a [Formatted] result, which the user can use to override a file. pub fn format_node< - O: FormatOptions, + C: FormatContext, L: Language, - N: FormatWithRule, Options = O>, + N: FormatWithRule, Context = C>, >( - options: O, + options: C, root: &N, ) -> FormatResult { tracing::trace_span!("format_node").in_scope(move || { @@ -700,7 +700,7 @@ where /// gets formatted instead of the smallest sub-expression that fits the range /// /// This runs a simple heuristic to determine the initial indentation -/// level of the node based on the provided [FormatOptions], which +/// level of the node based on the provided [FormatContext], which /// must match currently the current initial of the file. Additionally, /// because the reformatting happens only locally the resulting code /// will be indented with the same level as the original selection, @@ -708,16 +708,16 @@ where /// /// It returns a [Formatted] result with a range corresponding to the /// range of the input that was effectively overwritten by the formatter -pub fn format_range( - options: Options, +pub fn format_range( + options: Context, root: &SyntaxNode, mut range: TextRange, mut predicate: P, ) -> FormatResult where - Options: FormatOptions, + Context: FormatContext, L: Language, - R: FormatRule, Options = Options>, + R: FormatRule, Context = Context>, P: FnMut(&SyntaxNode) -> bool, { if range.is_empty() { @@ -931,7 +931,7 @@ where /// Formats a single node within a file, supported by Rome. /// /// This runs a simple heuristic to determine the initial indentation -/// level of the node based on the provided [FormatOptions], which +/// level of the node based on the provided [FormatContext], which /// must match currently the current initial of the file. Additionally, /// because the reformatting happens only locally the resulting code /// will be indented with the same level as the original selection, @@ -939,11 +939,11 @@ where /// /// It returns a [Formatted] result pub fn format_sub_tree< - O: FormatOptions, + C: FormatContext, L: Language, - N: FormatWithRule, Options = O>, + N: FormatWithRule, Context = C>, >( - options: O, + context: C, root: &N, ) -> FormatResult { let syntax = root.item(); @@ -985,7 +985,7 @@ pub fn format_sub_tree< // of indentation type detection yet. Unfortunately this // may not actually match the current content of the file let length = trivia.text().len() as u16; - match options.indent_style() { + match context.indent_style() { IndentStyle::Tab => length, IndentStyle::Space(width) => length / u16::from(width), } @@ -995,7 +995,7 @@ pub fn format_sub_tree< None => 0, }; - let formatted = format_node(options, root)?; + let formatted = format_node(context, root)?; let printed = formatted.print_with_indent(initial_indent); let sourcemap = Vec::from(printed.sourcemap()); let verbatim_ranges = Vec::from(printed.verbatim_ranges()); diff --git a/crates/rome_formatter/src/macros.rs b/crates/rome_formatter/src/macros.rs index 4093fa90f3b..58396bdc39b 100644 --- a/crates/rome_formatter/src/macros.rs +++ b/crates/rome_formatter/src/macros.rs @@ -26,7 +26,7 @@ use std::marker::PhantomData; /// You would write it like the following: /// /// ```rust -/// use rome_formatter::{FormatOptions, Formatted}; +/// use rome_formatter::{FormatContext, Formatted}; /// use rome_formatter::prelude::*; /// /// let element = format_elements![ @@ -44,7 +44,7 @@ use std::marker::PhantomData; /// ``` /// Or you can also create single element: /// ``` -/// use rome_formatter::{Formatted, FormatOptions}; +/// use rome_formatter::{Formatted, FormatContext}; /// use rome_formatter::prelude::*; /// /// use rome_formatter::prelude::*; @@ -81,14 +81,14 @@ macro_rules! format_elements { /// you would write: /// /// ```rust -/// use rome_formatter::FormatOptions; +/// use rome_formatter::FormatContext; /// use rome_formatter::prelude::*; /// /// struct TestFormat; /// /// impl Format for TestFormat { -/// type Options = (); -/// fn format(&self, _: &Formatter) -> FormatResult { +/// type Context = (); +/// fn format(&self, _: &Formatter) -> FormatResult { /// Ok(token("test")) /// } /// } @@ -122,7 +122,7 @@ macro_rules! format_elements { /// Or you can also create single element: /// ``` /// use rome_formatter::prelude::*; -/// use rome_formatter::FormatOptions; +/// use rome_formatter::FormatContext; /// /// let formatter = Formatter::<()>::default(); /// @@ -315,8 +315,8 @@ mod tests { struct TestFormat; impl Format for TestFormat { - type Options = (); - fn format(&self, _: &Formatter) -> FormatResult { + type Context = (); + fn format(&self, _: &Formatter) -> FormatResult { Ok(token("test")) } } diff --git a/crates/rome_js_formatter/src/check_reformat.rs b/crates/rome_js_formatter/src/check_reformat.rs index 9b64376d88f..aa00959c764 100644 --- a/crates/rome_js_formatter/src/check_reformat.rs +++ b/crates/rome_js_formatter/src/check_reformat.rs @@ -1,4 +1,4 @@ -use crate::{format_node, JsFormatOptions}; +use crate::{format_node, JsFormatContext}; use rome_diagnostics::{file::SimpleFiles, termcolor, Emitter}; use rome_js_parser::parse; use rome_js_syntax::{JsSyntaxNode, SourceType}; @@ -8,7 +8,7 @@ pub struct CheckReformatParams<'a> { pub text: &'a str, pub source_type: SourceType, pub file_name: &'a str, - pub format_options: JsFormatOptions, + pub format_context: JsFormatContext, } /// Perform a second pass of formatting on a file, printing a diff if the @@ -19,7 +19,7 @@ pub fn check_reformat(params: CheckReformatParams) { text, source_type, file_name, - format_options, + format_context: format_options, } = params; let re_parse = parse(text, 0, source_type); diff --git a/crates/rome_js_formatter/src/options.rs b/crates/rome_js_formatter/src/context.rs similarity index 67% rename from crates/rome_js_formatter/src/options.rs rename to crates/rome_js_formatter/src/context.rs index 3380e54c1f2..7dd01777623 100644 --- a/crates/rome_js_formatter/src/options.rs +++ b/crates/rome_js_formatter/src/context.rs @@ -1,21 +1,52 @@ use rome_formatter::printer::PrinterOptions; -use rome_formatter::{FormatOptions, IndentStyle, LineWidth}; +use rome_formatter::{FormatContext, IndentStyle, LineWidth}; +use rome_js_syntax::SourceType; use std::fmt; +use std::fmt::Debug; use std::str::FromStr; #[derive(Debug, Copy, Clone, Default)] -pub struct JsFormatOptions { +pub struct JsFormatContext { /// The indent style. pub indent_style: IndentStyle, /// What's the max width of a line. Defaults to 80. pub line_width: LineWidth, + /// Options of current instance of the formatter + pub options: JsFormatOptions, + + /// Information relative to the current file + pub source_type: SourceType, +} + +impl JsFormatContext { + pub fn new( + indent_style: IndentStyle, + line_width: LineWidth, + options: JsFormatOptions, + source_type: SourceType, + ) -> Self { + Self { + indent_style, + line_width, + options, + source_type, + } + } + + pub fn quote_style(&self) -> QuoteStyle { + self.options.quote_style + } +} + +#[derive(Debug, Copy, Clone, Default)] +pub struct JsFormatOptions { // The style for quotes. Defaults to double. pub quote_style: QuoteStyle, } -impl JsFormatOptions { +impl JsFormatContext { pub fn tab_width(&self) -> u8 { match self.indent_style { IndentStyle::Tab => 2, @@ -24,7 +55,7 @@ impl JsFormatOptions { } } -impl FormatOptions for JsFormatOptions { +impl FormatContext for JsFormatContext { fn indent_style(&self) -> IndentStyle { self.indent_style } @@ -40,10 +71,17 @@ impl FormatOptions for JsFormatOptions { } } -impl fmt::Display for JsFormatOptions { +impl fmt::Display for JsFormatContext { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { writeln!(f, "Indent style: {}", self.indent_style)?; writeln!(f, "Line width: {}", self.line_width.value())?; + write!(f, "{}", self.options)?; + Ok(()) + } +} + +impl fmt::Display for JsFormatOptions { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { writeln!(f, "Quote style: {}", self.quote_style)?; Ok(()) } diff --git a/crates/rome_js_formatter/src/cst.rs b/crates/rome_js_formatter/src/cst.rs index 0ed9ba5adf1..31414063a59 100644 --- a/crates/rome_js_formatter/src/cst.rs +++ b/crates/rome_js_formatter/src/cst.rs @@ -1,17 +1,17 @@ use crate::prelude::*; use rome_formatter::{FormatOwnedWithRule, FormatRefWithRule}; -use crate::{AsFormat, IntoFormat, JsFormatOptions}; +use crate::{AsFormat, IntoFormat, JsFormatContext}; use rome_js_syntax::{map_syntax_node, JsSyntaxNode}; pub struct FormatJsSyntaxNode; impl rome_formatter::FormatRule for FormatJsSyntaxNode { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsSyntaxNode, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { map_syntax_node!(node.clone(), node => formatted![formatter, [node.format()]]) } diff --git a/crates/rome_js_formatter/src/formatter.rs b/crates/rome_js_formatter/src/formatter.rs index c11a337f175..4639ce2b14c 100644 --- a/crates/rome_js_formatter/src/formatter.rs +++ b/crates/rome_js_formatter/src/formatter.rs @@ -1,9 +1,7 @@ use crate::prelude::*; - +use crate::{AsFormat, JsFormatContext}; use rome_formatter::{normalize_newlines, FormatResult, GroupId, LINE_TERMINATORS}; use rome_js_syntax::{JsLanguage, JsSyntaxNode, JsSyntaxToken}; - -use crate::{AsFormat, JsFormatOptions}; use rome_rowan::{AstNode, AstNodeList, AstSeparatedList, Language, SyntaxTriviaPiece, TextRange}; use std::iter::once; @@ -76,9 +74,9 @@ pub struct FormatVerbatimNode<'node> { } impl Format for FormatVerbatimNode<'_> { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { let verbatim = format_verbatim_node_or_token(self.node, formatter); Ok(FormatElement::Verbatim(Verbatim::new_verbatim( verbatim, @@ -99,9 +97,9 @@ pub struct FormatUnknownNode<'node> { } impl Format for FormatUnknownNode<'_> { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { Ok(FormatElement::Verbatim(Verbatim::new_unknown( format_verbatim_node_or_token(self.node, formatter), ))) @@ -119,9 +117,9 @@ pub struct FormatSuppressedNode<'node> { } impl Format for FormatSuppressedNode<'_> { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { formatted![ formatter, [ @@ -138,7 +136,7 @@ impl Format for FormatSuppressedNode<'_> { fn format_verbatim_node_or_token( node: &JsSyntaxNode, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatElement { for token in node.descendants_tokens() { formatter.track_token(&token); @@ -438,7 +436,7 @@ where /// JS specific formatter extensions pub(crate) trait JsFormatter { - fn as_formatter(&self) -> &Formatter; + fn as_formatter(&self) -> &Formatter; #[must_use] fn delimited<'a, 'fmt>( @@ -599,8 +597,8 @@ pub(crate) trait JsFormatter { } } -impl JsFormatter for Formatter { - fn as_formatter(&self) -> &Formatter { +impl JsFormatter for Formatter { + fn as_formatter(&self) -> &Formatter { self } } @@ -615,7 +613,7 @@ pub struct FormatDelimited<'a, 'fmt> { content: FormatElement, close_token: &'a JsSyntaxToken, mode: DelimitedMode, - formatter: &'fmt Formatter, + formatter: &'fmt Formatter, } impl<'a, 'fmt> FormatDelimited<'a, 'fmt> { @@ -623,7 +621,7 @@ impl<'a, 'fmt> FormatDelimited<'a, 'fmt> { open_token: &'a JsSyntaxToken, content: FormatElement, close_token: &'a JsSyntaxToken, - formatter: &'fmt Formatter, + formatter: &'fmt Formatter, ) -> Self { Self { open_token, diff --git a/crates/rome_js_formatter/src/js/any/array_assignment_pattern_element.rs b/crates/rome_js_formatter/src/js/any/array_assignment_pattern_element.rs index 5e313817420..820c213baa3 100644 --- a/crates/rome_js_formatter/src/js/any/array_assignment_pattern_element.rs +++ b/crates/rome_js_formatter/src/js/any/array_assignment_pattern_element.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyArrayAssignmentPatternElement; use crate::prelude::*; use rome_js_syntax::JsAnyArrayAssignmentPatternElement; impl FormatRule for FormatJsAnyArrayAssignmentPatternElement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyArrayAssignmentPatternElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyArrayAssignmentPatternElement::JsAssignmentWithDefault(node) => { diff --git a/crates/rome_js_formatter/src/js/any/array_binding_pattern_element.rs b/crates/rome_js_formatter/src/js/any/array_binding_pattern_element.rs index 10bde376717..f1892c4040f 100644 --- a/crates/rome_js_formatter/src/js/any/array_binding_pattern_element.rs +++ b/crates/rome_js_formatter/src/js/any/array_binding_pattern_element.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyArrayBindingPatternElement; use crate::prelude::*; use rome_js_syntax::JsAnyArrayBindingPatternElement; impl FormatRule for FormatJsAnyArrayBindingPatternElement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyArrayBindingPatternElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyArrayBindingPatternElement::JsArrayHole(node) => { diff --git a/crates/rome_js_formatter/src/js/any/array_element.rs b/crates/rome_js_formatter/src/js/any/array_element.rs index 2de183e44e9..c0519d22817 100644 --- a/crates/rome_js_formatter/src/js/any/array_element.rs +++ b/crates/rome_js_formatter/src/js/any/array_element.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyArrayElement; use crate::prelude::*; use rome_js_syntax::JsAnyArrayElement; impl FormatRule for FormatJsAnyArrayElement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyArrayElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyArrayElement::JsAnyExpression(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/arrow_function_parameters.rs b/crates/rome_js_formatter/src/js/any/arrow_function_parameters.rs index aa780b56c02..0067e2a6328 100644 --- a/crates/rome_js_formatter/src/js/any/arrow_function_parameters.rs +++ b/crates/rome_js_formatter/src/js/any/arrow_function_parameters.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyArrowFunctionParameters; use crate::prelude::*; use rome_js_syntax::JsAnyArrowFunctionParameters; impl FormatRule for FormatJsAnyArrowFunctionParameters { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyArrowFunctionParameters, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyArrowFunctionParameters::JsParameters(node) => { diff --git a/crates/rome_js_formatter/src/js/any/assignment.rs b/crates/rome_js_formatter/src/js/any/assignment.rs index 1c0b7633272..5cff1b3f767 100644 --- a/crates/rome_js_formatter/src/js/any/assignment.rs +++ b/crates/rome_js_formatter/src/js/any/assignment.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyAssignment; use crate::prelude::*; use rome_js_syntax::JsAnyAssignment; impl FormatRule for FormatJsAnyAssignment { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyAssignment::JsIdentifierAssignment(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/assignment_pattern.rs b/crates/rome_js_formatter/src/js/any/assignment_pattern.rs index 1d1a9ffe219..ffd5acfcfc2 100644 --- a/crates/rome_js_formatter/src/js/any/assignment_pattern.rs +++ b/crates/rome_js_formatter/src/js/any/assignment_pattern.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyAssignmentPattern; use crate::prelude::*; use rome_js_syntax::JsAnyAssignmentPattern; impl FormatRule for FormatJsAnyAssignmentPattern { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyAssignmentPattern, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyAssignmentPattern::JsAnyAssignment(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/binding.rs b/crates/rome_js_formatter/src/js/any/binding.rs index 1883653fa14..80647a758da 100644 --- a/crates/rome_js_formatter/src/js/any/binding.rs +++ b/crates/rome_js_formatter/src/js/any/binding.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyBinding; use crate::prelude::*; use rome_js_syntax::JsAnyBinding; impl FormatRule for FormatJsAnyBinding { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyBinding, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyBinding::JsIdentifierBinding(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/binding_pattern.rs b/crates/rome_js_formatter/src/js/any/binding_pattern.rs index 57fcca3b66b..8d653822f7e 100644 --- a/crates/rome_js_formatter/src/js/any/binding_pattern.rs +++ b/crates/rome_js_formatter/src/js/any/binding_pattern.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyBindingPattern; use crate::prelude::*; use rome_js_syntax::JsAnyBindingPattern; impl FormatRule for FormatJsAnyBindingPattern { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyBindingPattern, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyBindingPattern::JsAnyBinding(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/call_argument.rs b/crates/rome_js_formatter/src/js/any/call_argument.rs index 3a1b517c984..db8b9dc3c3f 100644 --- a/crates/rome_js_formatter/src/js/any/call_argument.rs +++ b/crates/rome_js_formatter/src/js/any/call_argument.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyCallArgument; use crate::prelude::*; use rome_js_syntax::JsAnyCallArgument; impl FormatRule for FormatJsAnyCallArgument { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyCallArgument, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyCallArgument::JsAnyExpression(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/class.rs b/crates/rome_js_formatter/src/js/any/class.rs index 9367b1e516b..f23ac3419e6 100644 --- a/crates/rome_js_formatter/src/js/any/class.rs +++ b/crates/rome_js_formatter/src/js/any/class.rs @@ -4,11 +4,11 @@ use rome_js_syntax::JsAnyClass; use rome_rowan::AstNode; impl FormatRule for FormatJsAnyClass { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyClass, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let abstract_token = node.abstract_token(); let id = node.id(); diff --git a/crates/rome_js_formatter/src/js/any/class_member.rs b/crates/rome_js_formatter/src/js/any/class_member.rs index 091b01964f6..407a75d308c 100644 --- a/crates/rome_js_formatter/src/js/any/class_member.rs +++ b/crates/rome_js_formatter/src/js/any/class_member.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyClassMember; use crate::prelude::*; use rome_js_syntax::JsAnyClassMember; impl FormatRule for FormatJsAnyClassMember { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyClassMember::JsConstructorClassMember(node) => { diff --git a/crates/rome_js_formatter/src/js/any/class_member_name.rs b/crates/rome_js_formatter/src/js/any/class_member_name.rs index d593413a0b8..81b1091995e 100644 --- a/crates/rome_js_formatter/src/js/any/class_member_name.rs +++ b/crates/rome_js_formatter/src/js/any/class_member_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyClassMemberName; use crate::prelude::*; use rome_js_syntax::JsAnyClassMemberName; impl FormatRule for FormatJsAnyClassMemberName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyClassMemberName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyClassMemberName::JsLiteralMemberName(node) => { diff --git a/crates/rome_js_formatter/src/js/any/constructor_parameter.rs b/crates/rome_js_formatter/src/js/any/constructor_parameter.rs index 20e71525d1d..dfbf4c4e027 100644 --- a/crates/rome_js_formatter/src/js/any/constructor_parameter.rs +++ b/crates/rome_js_formatter/src/js/any/constructor_parameter.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyConstructorParameter; use crate::prelude::*; use rome_js_syntax::JsAnyConstructorParameter; impl FormatRule for FormatJsAnyConstructorParameter { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyConstructorParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyConstructorParameter::JsAnyFormalParameter(node) => { diff --git a/crates/rome_js_formatter/src/js/any/declaration.rs b/crates/rome_js_formatter/src/js/any/declaration.rs index dfba2c1108f..d4bcb240325 100644 --- a/crates/rome_js_formatter/src/js/any/declaration.rs +++ b/crates/rome_js_formatter/src/js/any/declaration.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyDeclaration; use crate::prelude::*; use rome_js_syntax::JsAnyDeclaration; impl FormatRule for FormatJsAnyDeclaration { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyDeclaration::JsClassDeclaration(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/declaration_clause.rs b/crates/rome_js_formatter/src/js/any/declaration_clause.rs index 5a7e763fbee..1274f37b8d8 100644 --- a/crates/rome_js_formatter/src/js/any/declaration_clause.rs +++ b/crates/rome_js_formatter/src/js/any/declaration_clause.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyDeclarationClause; use crate::prelude::*; use rome_js_syntax::JsAnyDeclarationClause; impl FormatRule for FormatJsAnyDeclarationClause { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyDeclarationClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyDeclarationClause::JsClassDeclaration(node) => { diff --git a/crates/rome_js_formatter/src/js/any/export_clause.rs b/crates/rome_js_formatter/src/js/any/export_clause.rs index e43eea25a33..cc4f3f265be 100644 --- a/crates/rome_js_formatter/src/js/any/export_clause.rs +++ b/crates/rome_js_formatter/src/js/any/export_clause.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyExportClause; use crate::prelude::*; use rome_js_syntax::JsAnyExportClause; impl FormatRule for FormatJsAnyExportClause { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyExportClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyExportClause::JsExportDefaultDeclarationClause(node) => { diff --git a/crates/rome_js_formatter/src/js/any/export_default_declaration.rs b/crates/rome_js_formatter/src/js/any/export_default_declaration.rs index edf9f8749e9..e6961acb7e2 100644 --- a/crates/rome_js_formatter/src/js/any/export_default_declaration.rs +++ b/crates/rome_js_formatter/src/js/any/export_default_declaration.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyExportDefaultDeclaration; use crate::prelude::*; use rome_js_syntax::JsAnyExportDefaultDeclaration; impl FormatRule for FormatJsAnyExportDefaultDeclaration { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyExportDefaultDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyExportDefaultDeclaration::JsClassExportDefaultDeclaration(node) => { diff --git a/crates/rome_js_formatter/src/js/any/export_named_specifier.rs b/crates/rome_js_formatter/src/js/any/export_named_specifier.rs index 28242ac3966..bc42bbb3d6e 100644 --- a/crates/rome_js_formatter/src/js/any/export_named_specifier.rs +++ b/crates/rome_js_formatter/src/js/any/export_named_specifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyExportNamedSpecifier; use crate::prelude::*; use rome_js_syntax::JsAnyExportNamedSpecifier; impl FormatRule for FormatJsAnyExportNamedSpecifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyExportNamedSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyExportNamedSpecifier::JsExportNamedShorthandSpecifier(node) => { diff --git a/crates/rome_js_formatter/src/js/any/expression.rs b/crates/rome_js_formatter/src/js/any/expression.rs index a4db9a3ced5..5ded2107875 100644 --- a/crates/rome_js_formatter/src/js/any/expression.rs +++ b/crates/rome_js_formatter/src/js/any/expression.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyExpression; use crate::prelude::*; use rome_js_syntax::JsAnyExpression; impl FormatRule for FormatJsAnyExpression { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyExpression::JsAnyLiteralExpression(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/for_in_or_of_initializer.rs b/crates/rome_js_formatter/src/js/any/for_in_or_of_initializer.rs index 3a3021cc710..5da1c8ef4e5 100644 --- a/crates/rome_js_formatter/src/js/any/for_in_or_of_initializer.rs +++ b/crates/rome_js_formatter/src/js/any/for_in_or_of_initializer.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyForInOrOfInitializer; use crate::prelude::*; use rome_js_syntax::JsAnyForInOrOfInitializer; impl FormatRule for FormatJsAnyForInOrOfInitializer { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyForInOrOfInitializer, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyForInOrOfInitializer::JsAnyAssignmentPattern(node) => { diff --git a/crates/rome_js_formatter/src/js/any/for_initializer.rs b/crates/rome_js_formatter/src/js/any/for_initializer.rs index c644b88d949..64bfdc12809 100644 --- a/crates/rome_js_formatter/src/js/any/for_initializer.rs +++ b/crates/rome_js_formatter/src/js/any/for_initializer.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyForInitializer; use crate::prelude::*; use rome_js_syntax::JsAnyForInitializer; impl FormatRule for FormatJsAnyForInitializer { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyForInitializer, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyForInitializer::JsVariableDeclaration(node) => { diff --git a/crates/rome_js_formatter/src/js/any/formal_parameter.rs b/crates/rome_js_formatter/src/js/any/formal_parameter.rs index de3de6259c4..1cd81796cdc 100644 --- a/crates/rome_js_formatter/src/js/any/formal_parameter.rs +++ b/crates/rome_js_formatter/src/js/any/formal_parameter.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyFormalParameter; use crate::prelude::*; use rome_js_syntax::JsAnyFormalParameter; impl FormatRule for FormatJsAnyFormalParameter { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyFormalParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyFormalParameter::JsFormalParameter(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/function.rs b/crates/rome_js_formatter/src/js/any/function.rs index 24268050047..4cd782e6258 100644 --- a/crates/rome_js_formatter/src/js/any/function.rs +++ b/crates/rome_js_formatter/src/js/any/function.rs @@ -7,11 +7,11 @@ use rome_js_syntax::{ }; impl FormatRule for FormatJsAnyFunction { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyFunction, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut tokens = vec![]; diff --git a/crates/rome_js_formatter/src/js/any/function_body.rs b/crates/rome_js_formatter/src/js/any/function_body.rs index f507c76b322..3dec68b1940 100644 --- a/crates/rome_js_formatter/src/js/any/function_body.rs +++ b/crates/rome_js_formatter/src/js/any/function_body.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyFunctionBody; use crate::prelude::*; use rome_js_syntax::JsAnyFunctionBody; impl FormatRule for FormatJsAnyFunctionBody { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyFunctionBody, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyFunctionBody::JsAnyExpression(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/import_assertion_entry.rs b/crates/rome_js_formatter/src/js/any/import_assertion_entry.rs index d78666ce981..0227369318c 100644 --- a/crates/rome_js_formatter/src/js/any/import_assertion_entry.rs +++ b/crates/rome_js_formatter/src/js/any/import_assertion_entry.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyImportAssertionEntry; use crate::prelude::*; use rome_js_syntax::JsAnyImportAssertionEntry; impl FormatRule for FormatJsAnyImportAssertionEntry { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyImportAssertionEntry, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyImportAssertionEntry::JsImportAssertionEntry(node) => { diff --git a/crates/rome_js_formatter/src/js/any/import_clause.rs b/crates/rome_js_formatter/src/js/any/import_clause.rs index f61bba04a12..728e8b71add 100644 --- a/crates/rome_js_formatter/src/js/any/import_clause.rs +++ b/crates/rome_js_formatter/src/js/any/import_clause.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyImportClause; use crate::prelude::*; use rome_js_syntax::JsAnyImportClause; impl FormatRule for FormatJsAnyImportClause { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyImportClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyImportClause::JsImportBareClause(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/in_property.rs b/crates/rome_js_formatter/src/js/any/in_property.rs index fd74687a822..dc6b76ec15b 100644 --- a/crates/rome_js_formatter/src/js/any/in_property.rs +++ b/crates/rome_js_formatter/src/js/any/in_property.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyInProperty; use crate::prelude::*; use rome_js_syntax::JsAnyInProperty; impl FormatRule for FormatJsAnyInProperty { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyInProperty, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyInProperty::JsPrivateName(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/literal_expression.rs b/crates/rome_js_formatter/src/js/any/literal_expression.rs index 9f99f189029..b5010d4288f 100644 --- a/crates/rome_js_formatter/src/js/any/literal_expression.rs +++ b/crates/rome_js_formatter/src/js/any/literal_expression.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyLiteralExpression; use crate::prelude::*; use rome_js_syntax::JsAnyLiteralExpression; impl FormatRule for FormatJsAnyLiteralExpression { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyLiteralExpression::JsStringLiteralExpression(node) => { diff --git a/crates/rome_js_formatter/src/js/any/method_modifier.rs b/crates/rome_js_formatter/src/js/any/method_modifier.rs index b3f7daf8dee..2f5eef79128 100644 --- a/crates/rome_js_formatter/src/js/any/method_modifier.rs +++ b/crates/rome_js_formatter/src/js/any/method_modifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyMethodModifier; use crate::prelude::*; use rome_js_syntax::JsAnyMethodModifier; impl FormatRule for FormatJsAnyMethodModifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyMethodModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyMethodModifier::TsAccessibilityModifier(node) => { diff --git a/crates/rome_js_formatter/src/js/any/module_item.rs b/crates/rome_js_formatter/src/js/any/module_item.rs index dd0b1a78a9c..7563cba8468 100644 --- a/crates/rome_js_formatter/src/js/any/module_item.rs +++ b/crates/rome_js_formatter/src/js/any/module_item.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyModuleItem; use crate::prelude::*; use rome_js_syntax::JsAnyModuleItem; impl FormatRule for FormatJsAnyModuleItem { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyModuleItem, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyModuleItem::JsAnyStatement(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/name.rs b/crates/rome_js_formatter/src/js/any/name.rs index d1c31fd3cfe..6f9c382fecd 100644 --- a/crates/rome_js_formatter/src/js/any/name.rs +++ b/crates/rome_js_formatter/src/js/any/name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyName; use crate::prelude::*; use rome_js_syntax::JsAnyName; impl FormatRule for FormatJsAnyName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyName::JsName(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/named_import.rs b/crates/rome_js_formatter/src/js/any/named_import.rs index 4a98713a39b..5dabab186a7 100644 --- a/crates/rome_js_formatter/src/js/any/named_import.rs +++ b/crates/rome_js_formatter/src/js/any/named_import.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyNamedImport; use crate::prelude::*; use rome_js_syntax::JsAnyNamedImport; impl FormatRule for FormatJsAnyNamedImport { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyNamedImport, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyNamedImport::JsNamedImportSpecifiers(node) => { diff --git a/crates/rome_js_formatter/src/js/any/named_import_specifier.rs b/crates/rome_js_formatter/src/js/any/named_import_specifier.rs index be924df3be0..92af58a8aaa 100644 --- a/crates/rome_js_formatter/src/js/any/named_import_specifier.rs +++ b/crates/rome_js_formatter/src/js/any/named_import_specifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyNamedImportSpecifier; use crate::prelude::*; use rome_js_syntax::JsAnyNamedImportSpecifier; impl FormatRule for FormatJsAnyNamedImportSpecifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyNamedImportSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyNamedImportSpecifier::JsShorthandNamedImportSpecifier(node) => { diff --git a/crates/rome_js_formatter/src/js/any/object_assignment_pattern_member.rs b/crates/rome_js_formatter/src/js/any/object_assignment_pattern_member.rs index 0849d1a089b..6ce793757d0 100644 --- a/crates/rome_js_formatter/src/js/any/object_assignment_pattern_member.rs +++ b/crates/rome_js_formatter/src/js/any/object_assignment_pattern_member.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyObjectAssignmentPatternMember; use crate::prelude::*; use rome_js_syntax::JsAnyObjectAssignmentPatternMember; impl FormatRule for FormatJsAnyObjectAssignmentPatternMember { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyObjectAssignmentPatternMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyObjectAssignmentPatternMember::JsObjectAssignmentPatternShorthandProperty( diff --git a/crates/rome_js_formatter/src/js/any/object_binding_pattern_member.rs b/crates/rome_js_formatter/src/js/any/object_binding_pattern_member.rs index 4cbc6d8138b..08860af9911 100644 --- a/crates/rome_js_formatter/src/js/any/object_binding_pattern_member.rs +++ b/crates/rome_js_formatter/src/js/any/object_binding_pattern_member.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyObjectBindingPatternMember; use crate::prelude::*; use rome_js_syntax::JsAnyObjectBindingPatternMember; impl FormatRule for FormatJsAnyObjectBindingPatternMember { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyObjectBindingPatternMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyObjectBindingPatternMember::JsObjectBindingPatternProperty(node) => { diff --git a/crates/rome_js_formatter/src/js/any/object_member.rs b/crates/rome_js_formatter/src/js/any/object_member.rs index 941cd36a516..c2929b323bb 100644 --- a/crates/rome_js_formatter/src/js/any/object_member.rs +++ b/crates/rome_js_formatter/src/js/any/object_member.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyObjectMember; use crate::prelude::*; use rome_js_syntax::JsAnyObjectMember; impl FormatRule for FormatJsAnyObjectMember { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyObjectMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyObjectMember::JsPropertyObjectMember(node) => { diff --git a/crates/rome_js_formatter/src/js/any/object_member_name.rs b/crates/rome_js_formatter/src/js/any/object_member_name.rs index 941a620ff2e..9c902fb9087 100644 --- a/crates/rome_js_formatter/src/js/any/object_member_name.rs +++ b/crates/rome_js_formatter/src/js/any/object_member_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyObjectMemberName; use crate::prelude::*; use rome_js_syntax::JsAnyObjectMemberName; impl FormatRule for FormatJsAnyObjectMemberName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyObjectMemberName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyObjectMemberName::JsLiteralMemberName(node) => { diff --git a/crates/rome_js_formatter/src/js/any/parameter.rs b/crates/rome_js_formatter/src/js/any/parameter.rs index 1eb249546a3..7f6668351ed 100644 --- a/crates/rome_js_formatter/src/js/any/parameter.rs +++ b/crates/rome_js_formatter/src/js/any/parameter.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyParameter; use crate::prelude::*; use rome_js_syntax::JsAnyParameter; impl FormatRule for FormatJsAnyParameter { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyParameter::JsAnyFormalParameter(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/property_modifier.rs b/crates/rome_js_formatter/src/js/any/property_modifier.rs index eb6b8e656fc..74a7b322890 100644 --- a/crates/rome_js_formatter/src/js/any/property_modifier.rs +++ b/crates/rome_js_formatter/src/js/any/property_modifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyPropertyModifier; use crate::prelude::*; use rome_js_syntax::JsAnyPropertyModifier; impl FormatRule for FormatJsAnyPropertyModifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyPropertyModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyPropertyModifier::TsAccessibilityModifier(node) => { diff --git a/crates/rome_js_formatter/src/js/any/root.rs b/crates/rome_js_formatter/src/js/any/root.rs index 813fe6cfb27..ed7daa710cb 100644 --- a/crates/rome_js_formatter/src/js/any/root.rs +++ b/crates/rome_js_formatter/src/js/any/root.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyRoot; use crate::prelude::*; use rome_js_syntax::JsAnyRoot; impl FormatRule for FormatJsAnyRoot { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyRoot, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyRoot::JsScript(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/statement.rs b/crates/rome_js_formatter/src/js/any/statement.rs index 532592c5d77..e8bf385abe3 100644 --- a/crates/rome_js_formatter/src/js/any/statement.rs +++ b/crates/rome_js_formatter/src/js/any/statement.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyStatement; use crate::prelude::*; use rome_js_syntax::JsAnyStatement; impl FormatRule for FormatJsAnyStatement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyStatement::JsBlockStatement(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/switch_clause.rs b/crates/rome_js_formatter/src/js/any/switch_clause.rs index 5ef00232a72..49c850a26dd 100644 --- a/crates/rome_js_formatter/src/js/any/switch_clause.rs +++ b/crates/rome_js_formatter/src/js/any/switch_clause.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnySwitchClause; use crate::prelude::*; use rome_js_syntax::JsAnySwitchClause; impl FormatRule for FormatJsAnySwitchClause { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnySwitchClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnySwitchClause::JsCaseClause(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/js/any/template_element.rs b/crates/rome_js_formatter/src/js/any/template_element.rs index 6b073138932..76b2ba7a11f 100644 --- a/crates/rome_js_formatter/src/js/any/template_element.rs +++ b/crates/rome_js_formatter/src/js/any/template_element.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsAnyTemplateElement; use crate::prelude::*; use rome_js_syntax::JsAnyTemplateElement; impl FormatRule for FormatJsAnyTemplateElement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsAnyTemplateElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsAnyTemplateElement::JsTemplateChunkElement(node) => { diff --git a/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern.rs b/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern.rs index a532e55e55b..00991acee42 100644 --- a/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern.rs +++ b/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsArrayAssignmentPatternFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsArrayAssignmentPattern, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsArrayAssignmentPatternFields { l_brack_token, diff --git a/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern_rest_element.rs b/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern_rest_element.rs index d014c5cb06c..fa1c50e1dd0 100644 --- a/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern_rest_element.rs +++ b/crates/rome_js_formatter/src/js/assignments/array_assignment_pattern_rest_element.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsArrayAssignmentPatternRestElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsArrayAssignmentPatternRestElementFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/js/assignments/assignment_with_default.rs b/crates/rome_js_formatter/src/js/assignments/assignment_with_default.rs index b9110cacbfa..1cb2ab49d2a 100644 --- a/crates/rome_js_formatter/src/js/assignments/assignment_with_default.rs +++ b/crates/rome_js_formatter/src/js/assignments/assignment_with_default.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsAssignmentWithDefaultFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsAssignmentWithDefault, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsAssignmentWithDefaultFields { pattern, diff --git a/crates/rome_js_formatter/src/js/assignments/computed_member_assignment.rs b/crates/rome_js_formatter/src/js/assignments/computed_member_assignment.rs index 4a14f0c6379..228b7f4a732 100644 --- a/crates/rome_js_formatter/src/js/assignments/computed_member_assignment.rs +++ b/crates/rome_js_formatter/src/js/assignments/computed_member_assignment.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsComputedMemberAssignmentFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsComputedMemberAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsComputedMemberAssignmentFields { object, diff --git a/crates/rome_js_formatter/src/js/assignments/identifier_assignment.rs b/crates/rome_js_formatter/src/js/assignments/identifier_assignment.rs index 0925f7fde31..f263f0716cf 100644 --- a/crates/rome_js_formatter/src/js/assignments/identifier_assignment.rs +++ b/crates/rome_js_formatter/src/js/assignments/identifier_assignment.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsIdentifierAssignmentFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsIdentifierAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsIdentifierAssignmentFields { name_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern.rs b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern.rs index 7387b0f9fad..2ee4e33a6c8 100644 --- a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern.rs +++ b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern.rs @@ -6,7 +6,7 @@ use rome_js_syntax::JsObjectAssignmentPatternFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsObjectAssignmentPattern, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectAssignmentPatternFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_property.rs b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_property.rs index f9afcf7af12..e4bf979afd5 100644 --- a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_property.rs +++ b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_property.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsObjectAssignmentPatternProperty, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectAssignmentPatternPropertyFields { member, diff --git a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_rest.rs b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_rest.rs index d185019b602..cd76932a7df 100644 --- a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_rest.rs +++ b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_rest.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsObjectAssignmentPatternRest, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectAssignmentPatternRestFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_shorthand_property.rs b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_shorthand_property.rs index 643a4bca327..7d32fdfad85 100644 --- a/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_shorthand_property.rs +++ b/crates/rome_js_formatter/src/js/assignments/object_assignment_pattern_shorthand_property.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsObjectAssignmentPatternShorthandProperty, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectAssignmentPatternShorthandPropertyFields { identifier, init } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/assignments/parenthesized_assignment.rs b/crates/rome_js_formatter/src/js/assignments/parenthesized_assignment.rs index 2351210fc48..230798666cb 100644 --- a/crates/rome_js_formatter/src/js/assignments/parenthesized_assignment.rs +++ b/crates/rome_js_formatter/src/js/assignments/parenthesized_assignment.rs @@ -6,7 +6,7 @@ use rome_js_syntax::JsParenthesizedAssignmentFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsParenthesizedAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsParenthesizedAssignmentFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/js/assignments/static_member_assignment.rs b/crates/rome_js_formatter/src/js/assignments/static_member_assignment.rs index 273837fd213..c308d5efed1 100644 --- a/crates/rome_js_formatter/src/js/assignments/static_member_assignment.rs +++ b/crates/rome_js_formatter/src/js/assignments/static_member_assignment.rs @@ -6,7 +6,7 @@ use rome_js_syntax::JsStaticMemberAssignmentFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsStaticMemberAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsStaticMemberAssignmentFields { object, diff --git a/crates/rome_js_formatter/src/js/auxiliary/array_hole.rs b/crates/rome_js_formatter/src/js/auxiliary/array_hole.rs index 67a3d1d5bc5..215705bd9ab 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/array_hole.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/array_hole.rs @@ -6,7 +6,7 @@ use rome_js_syntax::JsArrayHole; impl FormatNodeFields for FormatNodeRule { fn format_fields( _: &JsArrayHole, - _: &Formatter, + _: &Formatter, ) -> FormatResult { Ok(empty_element()) } diff --git a/crates/rome_js_formatter/src/js/auxiliary/case_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/case_clause.rs index a84ec7f5c2c..c375b07c940 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/case_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/case_clause.rs @@ -9,7 +9,7 @@ use rome_js_syntax::JsCaseClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsCaseClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsCaseClauseFields { case_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/catch_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/catch_clause.rs index dac1ec6fef3..9d04fea1298 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/catch_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/catch_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsCatchClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsCatchClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsCatchClauseFields { catch_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/default_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/default_clause.rs index 7ad274776c4..5ae0d90721b 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/default_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/default_clause.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNodeList; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsDefaultClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsDefaultClauseFields { default_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/directive.rs b/crates/rome_js_formatter/src/js/auxiliary/directive.rs index cf2b034242a..8aaf5532799 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/directive.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/directive.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsDirectiveFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsDirective, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsDirectiveFields { value_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/else_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/else_clause.rs index 87160340aff..ae7c9fbebd7 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/else_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/else_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsElseClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsElseClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsElseClauseFields { else_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/expression_snipped.rs b/crates/rome_js_formatter/src/js/auxiliary/expression_snipped.rs index 4b7e5494082..78a10b405b6 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/expression_snipped.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/expression_snipped.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsExpressionSnippedFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExpressionSnipped, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExpressionSnippedFields { expression, diff --git a/crates/rome_js_formatter/src/js/auxiliary/finally_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/finally_clause.rs index adffb96bfd3..5ec926e4636 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/finally_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/finally_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsFinallyClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsFinallyClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsFinallyClauseFields { finally_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/function_body.rs b/crates/rome_js_formatter/src/js/auxiliary/function_body.rs index 462c10750e1..7de7076a64e 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/function_body.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/function_body.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsFunctionBodyFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsFunctionBody, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsFunctionBodyFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/initializer_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/initializer_clause.rs index 6c48d7b189a..6a973475a4f 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/initializer_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/initializer_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsInitializerClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsInitializerClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsInitializerClauseFields { eq_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/module.rs b/crates/rome_js_formatter/src/js/auxiliary/module.rs index 7791e661560..731937ab92d 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/module.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/module.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsModuleFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsModule, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsModuleFields { interpreter_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/name.rs b/crates/rome_js_formatter/src/js/auxiliary/name.rs index 6fcee0f294a..be532349d9d 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/name.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/name.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNameFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/auxiliary/new_target.rs b/crates/rome_js_formatter/src/js/auxiliary/new_target.rs index d85eb7322da..c9d8fa0a71a 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/new_target.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/new_target.rs @@ -7,7 +7,7 @@ use rome_js_syntax::NewTargetFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &NewTarget, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let NewTargetFields { new_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/private_name.rs b/crates/rome_js_formatter/src/js/auxiliary/private_name.rs index 403f28426f9..927475bea6e 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/private_name.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/private_name.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsPrivateNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsPrivateName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsPrivateNameFields { hash_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/reference_identifier.rs b/crates/rome_js_formatter/src/js/auxiliary/reference_identifier.rs index c359fa8aa9e..136769d4e9d 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/reference_identifier.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/reference_identifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsReferenceIdentifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsReferenceIdentifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsReferenceIdentifierFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/auxiliary/script.rs b/crates/rome_js_formatter/src/js/auxiliary/script.rs index 0091675b47f..8581c692d96 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/script.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/script.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsScriptFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsScript, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsScriptFields { interpreter_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/spread.rs b/crates/rome_js_formatter/src/js/auxiliary/spread.rs index 31c60dc14a6..ea83f9799d3 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/spread.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/spread.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsSpreadFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsSpread, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsSpreadFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/js/auxiliary/static_modifier.rs b/crates/rome_js_formatter/src/js/auxiliary/static_modifier.rs index 993cc51276f..8d98ea6f25d 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/static_modifier.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/static_modifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsStaticModifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsStaticModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsStaticModifierFields { modifier_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/auxiliary/variable_declaration_clause.rs b/crates/rome_js_formatter/src/js/auxiliary/variable_declaration_clause.rs index ab54ed588b5..bd4ed477d7c 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/variable_declaration_clause.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/variable_declaration_clause.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsVariableDeclarationClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsVariableDeclarationClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsVariableDeclarationClauseFields { declaration, diff --git a/crates/rome_js_formatter/src/js/auxiliary/variable_declarator.rs b/crates/rome_js_formatter/src/js/auxiliary/variable_declarator.rs index 763e692e0a4..4dee0a558c1 100644 --- a/crates/rome_js_formatter/src/js/auxiliary/variable_declarator.rs +++ b/crates/rome_js_formatter/src/js/auxiliary/variable_declarator.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsVariableDeclaratorFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsVariableDeclarator, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsVariableDeclaratorFields { id, diff --git a/crates/rome_js_formatter/src/js/bindings/array_binding_pattern.rs b/crates/rome_js_formatter/src/js/bindings/array_binding_pattern.rs index 673ef4af7cb..67d5e7879dc 100644 --- a/crates/rome_js_formatter/src/js/bindings/array_binding_pattern.rs +++ b/crates/rome_js_formatter/src/js/bindings/array_binding_pattern.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsArrayBindingPatternFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsArrayBindingPattern, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsArrayBindingPatternFields { l_brack_token, diff --git a/crates/rome_js_formatter/src/js/bindings/array_binding_pattern_rest_element.rs b/crates/rome_js_formatter/src/js/bindings/array_binding_pattern_rest_element.rs index 2a653e3d363..867dcbc6e6d 100644 --- a/crates/rome_js_formatter/src/js/bindings/array_binding_pattern_rest_element.rs +++ b/crates/rome_js_formatter/src/js/bindings/array_binding_pattern_rest_element.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsArrayBindingPatternRestElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsArrayBindingPatternRestElementFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/js/bindings/binding_pattern_with_default.rs b/crates/rome_js_formatter/src/js/bindings/binding_pattern_with_default.rs index e6dcc5b26ff..c51071150da 100644 --- a/crates/rome_js_formatter/src/js/bindings/binding_pattern_with_default.rs +++ b/crates/rome_js_formatter/src/js/bindings/binding_pattern_with_default.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsBindingPatternWithDefaultFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsBindingPatternWithDefault, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsBindingPatternWithDefaultFields { pattern, diff --git a/crates/rome_js_formatter/src/js/bindings/constructor_parameters.rs b/crates/rome_js_formatter/src/js/bindings/constructor_parameters.rs index ff04e51eeb5..cb2543faa60 100644 --- a/crates/rome_js_formatter/src/js/bindings/constructor_parameters.rs +++ b/crates/rome_js_formatter/src/js/bindings/constructor_parameters.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsConstructorParametersFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsConstructorParameters, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsConstructorParametersFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/js/bindings/formal_parameter.rs b/crates/rome_js_formatter/src/js/bindings/formal_parameter.rs index dcda2f405d7..dcd55634053 100644 --- a/crates/rome_js_formatter/src/js/bindings/formal_parameter.rs +++ b/crates/rome_js_formatter/src/js/bindings/formal_parameter.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsFormalParameterFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsFormalParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsFormalParameterFields { binding, diff --git a/crates/rome_js_formatter/src/js/bindings/identifier_binding.rs b/crates/rome_js_formatter/src/js/bindings/identifier_binding.rs index 0fad7609ce2..33199181aa3 100644 --- a/crates/rome_js_formatter/src/js/bindings/identifier_binding.rs +++ b/crates/rome_js_formatter/src/js/bindings/identifier_binding.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsIdentifierBindingFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsIdentifierBinding, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsIdentifierBindingFields { name_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern.rs b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern.rs index d5ac1c7ebe3..86da27462db 100644 --- a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern.rs +++ b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsObjectBindingPatternFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsObjectBindingPattern, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectBindingPatternFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_property.rs b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_property.rs index b2e5ec8a2ec..40504eee1eb 100644 --- a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_property.rs +++ b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_property.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsObjectBindingPatternProperty, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectBindingPatternPropertyFields { member, diff --git a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_rest.rs b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_rest.rs index ecc59b5b467..689e1979199 100644 --- a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_rest.rs +++ b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_rest.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsObjectBindingPatternRestFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsObjectBindingPatternRest, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectBindingPatternRestFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_shorthand_property.rs b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_shorthand_property.rs index 50d8ad914f3..3790eda7c94 100644 --- a/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_shorthand_property.rs +++ b/crates/rome_js_formatter/src/js/bindings/object_binding_pattern_shorthand_property.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsObjectBindingPatternShorthandProperty, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectBindingPatternShorthandPropertyFields { identifier, init } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/bindings/parameters.rs b/crates/rome_js_formatter/src/js/bindings/parameters.rs index 67e881e4847..01128c3b143 100644 --- a/crates/rome_js_formatter/src/js/bindings/parameters.rs +++ b/crates/rome_js_formatter/src/js/bindings/parameters.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsParametersFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsParameters, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsParametersFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/js/bindings/rest_parameter.rs b/crates/rome_js_formatter/src/js/bindings/rest_parameter.rs index bd760749243..c637c4d28b9 100644 --- a/crates/rome_js_formatter/src/js/bindings/rest_parameter.rs +++ b/crates/rome_js_formatter/src/js/bindings/rest_parameter.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsRestParameterFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsRestParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsRestParameterFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/js/classes/constructor_class_member.rs b/crates/rome_js_formatter/src/js/classes/constructor_class_member.rs index b0f5eef247c..46eaff2d748 100644 --- a/crates/rome_js_formatter/src/js/classes/constructor_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/constructor_class_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsConstructorClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsConstructorClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsConstructorClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/js/classes/empty_class_member.rs b/crates/rome_js_formatter/src/js/classes/empty_class_member.rs index 397be9ae402..4215c483ba3 100644 --- a/crates/rome_js_formatter/src/js/classes/empty_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/empty_class_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsEmptyClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsEmptyClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsEmptyClassMemberFields { semicolon_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/classes/extends_clause.rs b/crates/rome_js_formatter/src/js/classes/extends_clause.rs index 9304327de53..f4e9e66c216 100644 --- a/crates/rome_js_formatter/src/js/classes/extends_clause.rs +++ b/crates/rome_js_formatter/src/js/classes/extends_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsExtendsClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExtendsClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExtendsClauseFields { extends_token, diff --git a/crates/rome_js_formatter/src/js/classes/getter_class_member.rs b/crates/rome_js_formatter/src/js/classes/getter_class_member.rs index 739d2e06880..1c019688875 100644 --- a/crates/rome_js_formatter/src/js/classes/getter_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/getter_class_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsGetterClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsGetterClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsGetterClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/js/classes/method_class_member.rs b/crates/rome_js_formatter/src/js/classes/method_class_member.rs index cdab1e4dc7f..25caefa44aa 100644 --- a/crates/rome_js_formatter/src/js/classes/method_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/method_class_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsMethodClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsMethodClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsMethodClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/js/classes/property_class_member.rs b/crates/rome_js_formatter/src/js/classes/property_class_member.rs index 2d0849f2308..4ad0b119d1a 100644 --- a/crates/rome_js_formatter/src/js/classes/property_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/property_class_member.rs @@ -9,7 +9,7 @@ use rome_js_syntax::JsPropertyClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsPropertyClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsPropertyClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/js/classes/setter_class_member.rs b/crates/rome_js_formatter/src/js/classes/setter_class_member.rs index e11718ddd1d..1efdc53b6ad 100644 --- a/crates/rome_js_formatter/src/js/classes/setter_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/setter_class_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsSetterClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsSetterClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsSetterClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/js/classes/static_initialization_block_class_member.rs b/crates/rome_js_formatter/src/js/classes/static_initialization_block_class_member.rs index b670ac09004..d5eddce0766 100644 --- a/crates/rome_js_formatter/src/js/classes/static_initialization_block_class_member.rs +++ b/crates/rome_js_formatter/src/js/classes/static_initialization_block_class_member.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsStaticInitializationBlockClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsStaticInitializationBlockClassMemberFields { static_token, diff --git a/crates/rome_js_formatter/src/js/declarations/catch_declaration.rs b/crates/rome_js_formatter/src/js/declarations/catch_declaration.rs index 2b63c5ce9e4..d1c2cba1162 100644 --- a/crates/rome_js_formatter/src/js/declarations/catch_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/catch_declaration.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsCatchDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsCatchDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsCatchDeclarationFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/js/declarations/class_declaration.rs b/crates/rome_js_formatter/src/js/declarations/class_declaration.rs index d3bce53d4d5..c7ca259ef59 100644 --- a/crates/rome_js_formatter/src/js/declarations/class_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/class_declaration.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{JsAnyClass, JsClassDeclaration}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsClassDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyClass::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/declarations/class_export_default_declaration.rs b/crates/rome_js_formatter/src/js/declarations/class_export_default_declaration.rs index 7e4d43f384c..79284a8c40e 100644 --- a/crates/rome_js_formatter/src/js/declarations/class_export_default_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/class_export_default_declaration.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsClassExportDefaultDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyClass::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/declarations/for_variable_declaration.rs b/crates/rome_js_formatter/src/js/declarations/for_variable_declaration.rs index c3017e4847c..62748e82473 100644 --- a/crates/rome_js_formatter/src/js/declarations/for_variable_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/for_variable_declaration.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsForVariableDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsForVariableDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsForVariableDeclarationFields { kind_token, diff --git a/crates/rome_js_formatter/src/js/declarations/function_declaration.rs b/crates/rome_js_formatter/src/js/declarations/function_declaration.rs index bdeb84be597..db1cd01be49 100644 --- a/crates/rome_js_formatter/src/js/declarations/function_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/function_declaration.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{JsAnyFunction, JsFunctionDeclaration}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsFunctionDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyFunction::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/declarations/function_export_default_declaration.rs b/crates/rome_js_formatter/src/js/declarations/function_export_default_declaration.rs index 5c01c7a81af..632870a7b6e 100644 --- a/crates/rome_js_formatter/src/js/declarations/function_export_default_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/function_export_default_declaration.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsFunctionExportDefaultDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyFunction::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/declarations/variable_declaration.rs b/crates/rome_js_formatter/src/js/declarations/variable_declaration.rs index 03c304486ef..f9879a05111 100644 --- a/crates/rome_js_formatter/src/js/declarations/variable_declaration.rs +++ b/crates/rome_js_formatter/src/js/declarations/variable_declaration.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsVariableDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsVariableDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsVariableDeclarationFields { kind, declarators } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/array_expression.rs b/crates/rome_js_formatter/src/js/expressions/array_expression.rs index 33749ffedd7..894629fe9b4 100644 --- a/crates/rome_js_formatter/src/js/expressions/array_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/array_expression.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsArrayExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsArrayExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsArrayExpressionFields { l_brack_token, diff --git a/crates/rome_js_formatter/src/js/expressions/arrow_function_expression.rs b/crates/rome_js_formatter/src/js/expressions/arrow_function_expression.rs index 60e2543af3f..a74d182f0ab 100644 --- a/crates/rome_js_formatter/src/js/expressions/arrow_function_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/arrow_function_expression.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{JsAnyFunction, JsArrowFunctionExpression}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsArrowFunctionExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyFunction::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/expressions/assignment_expression.rs b/crates/rome_js_formatter/src/js/expressions/assignment_expression.rs index 68776cf3a66..38f5f646a0c 100644 --- a/crates/rome_js_formatter/src/js/expressions/assignment_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/assignment_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsAssignmentExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsAssignmentExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsAssignmentExpressionFields { left, diff --git a/crates/rome_js_formatter/src/js/expressions/await_expression.rs b/crates/rome_js_formatter/src/js/expressions/await_expression.rs index 8b214ea1e3c..42c4de6c05e 100644 --- a/crates/rome_js_formatter/src/js/expressions/await_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/await_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsAwaitExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsAwaitExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsAwaitExpressionFields { await_token, diff --git a/crates/rome_js_formatter/src/js/expressions/big_int_literal_expression.rs b/crates/rome_js_formatter/src/js/expressions/big_int_literal_expression.rs index 2b98bac0851..4e8029705b7 100644 --- a/crates/rome_js_formatter/src/js/expressions/big_int_literal_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/big_int_literal_expression.rs @@ -10,7 +10,7 @@ use rome_js_syntax::JsBigIntLiteralExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsBigIntLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsBigIntLiteralExpressionFields { value_token } = node.as_fields(); let value_token = value_token?; diff --git a/crates/rome_js_formatter/src/js/expressions/binary_expression.rs b/crates/rome_js_formatter/src/js/expressions/binary_expression.rs index 35d1d91ba61..33055444a49 100644 --- a/crates/rome_js_formatter/src/js/expressions/binary_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/binary_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsBinaryExpression; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsBinaryExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_binary_like_expression( JsAnyBinaryLikeExpression::JsBinaryExpression(node.clone()), diff --git a/crates/rome_js_formatter/src/js/expressions/boolean_literal_expression.rs b/crates/rome_js_formatter/src/js/expressions/boolean_literal_expression.rs index f23731261c1..c1f03c19f3c 100644 --- a/crates/rome_js_formatter/src/js/expressions/boolean_literal_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/boolean_literal_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsBooleanLiteralExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsBooleanLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsBooleanLiteralExpressionFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/call_arguments.rs b/crates/rome_js_formatter/src/js/expressions/call_arguments.rs index c4294525b8b..8976b2733ee 100644 --- a/crates/rome_js_formatter/src/js/expressions/call_arguments.rs +++ b/crates/rome_js_formatter/src/js/expressions/call_arguments.rs @@ -9,7 +9,7 @@ use rome_rowan::{AstSeparatedList, SyntaxResult}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsCallArguments, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsCallArgumentsFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/js/expressions/call_expression.rs b/crates/rome_js_formatter/src/js/expressions/call_expression.rs index be9ba3c73d6..78a51bfcc7e 100644 --- a/crates/rome_js_formatter/src/js/expressions/call_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/call_expression.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsCallExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_call_expression(node.syntax(), formatter) } diff --git a/crates/rome_js_formatter/src/js/expressions/class_expression.rs b/crates/rome_js_formatter/src/js/expressions/class_expression.rs index 0def7f73405..23230c11f85 100644 --- a/crates/rome_js_formatter/src/js/expressions/class_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/class_expression.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{JsAnyClass, JsClassExpression}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsClassExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyClass::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/expressions/computed_member_expression.rs b/crates/rome_js_formatter/src/js/expressions/computed_member_expression.rs index be839a48e47..1364a32e7b1 100644 --- a/crates/rome_js_formatter/src/js/expressions/computed_member_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/computed_member_expression.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsComputedMemberExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut current = node.clone(); diff --git a/crates/rome_js_formatter/src/js/expressions/conditional_expression.rs b/crates/rome_js_formatter/src/js/expressions/conditional_expression.rs index d30e23b3e60..54c39d98a52 100644 --- a/crates/rome_js_formatter/src/js/expressions/conditional_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/conditional_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsConditionalExpression; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsConditionalExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_conditional(Conditional::Expression(node.clone()), formatter, false) } diff --git a/crates/rome_js_formatter/src/js/expressions/function_expression.rs b/crates/rome_js_formatter/src/js/expressions/function_expression.rs index dec9d0ce690..75dae2c600e 100644 --- a/crates/rome_js_formatter/src/js/expressions/function_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/function_expression.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{JsAnyFunction, JsFunctionExpression}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsFunctionExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [JsAnyFunction::from(node.clone()).format()]] } diff --git a/crates/rome_js_formatter/src/js/expressions/identifier_expression.rs b/crates/rome_js_formatter/src/js/expressions/identifier_expression.rs index 0dc671464b6..2d138358d4b 100644 --- a/crates/rome_js_formatter/src/js/expressions/identifier_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/identifier_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsIdentifierExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsIdentifierExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsIdentifierExpressionFields { name } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/import_call_expression.rs b/crates/rome_js_formatter/src/js/expressions/import_call_expression.rs index 1ed75adee59..91801fe6e40 100644 --- a/crates/rome_js_formatter/src/js/expressions/import_call_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/import_call_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsImportCallExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportCallExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportCallExpressionFields { import_token, diff --git a/crates/rome_js_formatter/src/js/expressions/in_expression.rs b/crates/rome_js_formatter/src/js/expressions/in_expression.rs index 29197dd2056..7e7d71a2627 100644 --- a/crates/rome_js_formatter/src/js/expressions/in_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/in_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsInExpression; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsInExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_binary_like_expression( JsAnyBinaryLikeExpression::JsInExpression(node.clone()), diff --git a/crates/rome_js_formatter/src/js/expressions/instanceof_expression.rs b/crates/rome_js_formatter/src/js/expressions/instanceof_expression.rs index af37fb6eb17..6ce523ae59e 100644 --- a/crates/rome_js_formatter/src/js/expressions/instanceof_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/instanceof_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsInstanceofExpression; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsInstanceofExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_binary_like_expression( JsAnyBinaryLikeExpression::JsInstanceofExpression(node.clone()), diff --git a/crates/rome_js_formatter/src/js/expressions/logical_expression.rs b/crates/rome_js_formatter/src/js/expressions/logical_expression.rs index 0d849b8e2af..ab5c8ac0671 100644 --- a/crates/rome_js_formatter/src/js/expressions/logical_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/logical_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsLogicalExpression; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsLogicalExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_binary_like_expression( JsAnyBinaryLikeExpression::JsLogicalExpression(node.clone()), diff --git a/crates/rome_js_formatter/src/js/expressions/new_expression.rs b/crates/rome_js_formatter/src/js/expressions/new_expression.rs index 8f1e2861963..5f4b75d4982 100644 --- a/crates/rome_js_formatter/src/js/expressions/new_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/new_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNewExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsNewExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNewExpressionFields { new_token, diff --git a/crates/rome_js_formatter/src/js/expressions/null_literal_expression.rs b/crates/rome_js_formatter/src/js/expressions/null_literal_expression.rs index 3ab27722568..8e06d3ff2a8 100644 --- a/crates/rome_js_formatter/src/js/expressions/null_literal_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/null_literal_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNullLiteralExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsNullLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNullLiteralExpressionFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/number_literal_expression.rs b/crates/rome_js_formatter/src/js/expressions/number_literal_expression.rs index 111ad6c655b..e8dff725929 100644 --- a/crates/rome_js_formatter/src/js/expressions/number_literal_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/number_literal_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNumberLiteralExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsNumberLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNumberLiteralExpressionFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/object_expression.rs b/crates/rome_js_formatter/src/js/expressions/object_expression.rs index b603fd8176b..e9567df38be 100644 --- a/crates/rome_js_formatter/src/js/expressions/object_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/object_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsObjectExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsObjectExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsObjectExpressionFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/js/expressions/parenthesized_expression.rs b/crates/rome_js_formatter/src/js/expressions/parenthesized_expression.rs index 6e559e20436..e560f29f6f4 100644 --- a/crates/rome_js_formatter/src/js/expressions/parenthesized_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/parenthesized_expression.rs @@ -11,7 +11,7 @@ use rome_rowan::{AstNode, SyntaxResult}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsParenthesizedExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsParenthesizedExpressionFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/js/expressions/post_update_expression.rs b/crates/rome_js_formatter/src/js/expressions/post_update_expression.rs index 2368be5a66b..859b55f0c0d 100644 --- a/crates/rome_js_formatter/src/js/expressions/post_update_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/post_update_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsPostUpdateExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsPostUpdateExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsPostUpdateExpressionFields { operand, diff --git a/crates/rome_js_formatter/src/js/expressions/pre_update_expression.rs b/crates/rome_js_formatter/src/js/expressions/pre_update_expression.rs index 7760097bfae..00dd3db0dd9 100644 --- a/crates/rome_js_formatter/src/js/expressions/pre_update_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/pre_update_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsPreUpdateExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsPreUpdateExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsPreUpdateExpressionFields { operator_token, diff --git a/crates/rome_js_formatter/src/js/expressions/regex_literal_expression.rs b/crates/rome_js_formatter/src/js/expressions/regex_literal_expression.rs index 6d35cd97ecd..b2c63b22a42 100644 --- a/crates/rome_js_formatter/src/js/expressions/regex_literal_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/regex_literal_expression.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsRegexLiteralExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsRegexLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsRegexLiteralExpressionFields { value_token } = node.as_fields(); let value_token = value_token?; diff --git a/crates/rome_js_formatter/src/js/expressions/sequence_expression.rs b/crates/rome_js_formatter/src/js/expressions/sequence_expression.rs index 7ad6e3e6e59..db25c8f5cee 100644 --- a/crates/rome_js_formatter/src/js/expressions/sequence_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/sequence_expression.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsSequenceExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut current = node.clone(); let parent = current.syntax().parent(); diff --git a/crates/rome_js_formatter/src/js/expressions/static_member_expression.rs b/crates/rome_js_formatter/src/js/expressions/static_member_expression.rs index e142b9768fa..10f6ae4544b 100644 --- a/crates/rome_js_formatter/src/js/expressions/static_member_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/static_member_expression.rs @@ -10,7 +10,7 @@ use rome_js_syntax::JsStaticMemberExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsStaticMemberExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsStaticMemberExpressionFields { object, diff --git a/crates/rome_js_formatter/src/js/expressions/string_literal_expression.rs b/crates/rome_js_formatter/src/js/expressions/string_literal_expression.rs index 355d3538686..d2a76da4018 100644 --- a/crates/rome_js_formatter/src/js/expressions/string_literal_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/string_literal_expression.rs @@ -10,7 +10,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsStringLiteralExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsStringLiteralExpressionFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/super_expression.rs b/crates/rome_js_formatter/src/js/expressions/super_expression.rs index 61aa5f6a30c..4269ebd4a50 100644 --- a/crates/rome_js_formatter/src/js/expressions/super_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/super_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsSuperExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsSuperExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsSuperExpressionFields { super_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/template.rs b/crates/rome_js_formatter/src/js/expressions/template.rs index 0beb0317659..57097e286db 100644 --- a/crates/rome_js_formatter/src/js/expressions/template.rs +++ b/crates/rome_js_formatter/src/js/expressions/template.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsTemplateFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsTemplate, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsTemplateFields { tag, diff --git a/crates/rome_js_formatter/src/js/expressions/template_chunk_element.rs b/crates/rome_js_formatter/src/js/expressions/template_chunk_element.rs index c9913c3ea04..43a68d473ce 100644 --- a/crates/rome_js_formatter/src/js/expressions/template_chunk_element.rs +++ b/crates/rome_js_formatter/src/js/expressions/template_chunk_element.rs @@ -7,7 +7,7 @@ use rome_js_syntax::{JsTemplateChunkElement, JsTemplateChunkElementFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsTemplateChunkElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsTemplateChunkElementFields { template_chunk_token, diff --git a/crates/rome_js_formatter/src/js/expressions/template_element.rs b/crates/rome_js_formatter/src/js/expressions/template_element.rs index 5aa6b31898b..41e468402f3 100644 --- a/crates/rome_js_formatter/src/js/expressions/template_element.rs +++ b/crates/rome_js_formatter/src/js/expressions/template_element.rs @@ -6,7 +6,7 @@ use rome_js_syntax::JsTemplateElement; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsTemplateElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_template_literal(TemplateElement::Js(node.clone()), formatter) } diff --git a/crates/rome_js_formatter/src/js/expressions/this_expression.rs b/crates/rome_js_formatter/src/js/expressions/this_expression.rs index e8317fe87a1..8122b07cf14 100644 --- a/crates/rome_js_formatter/src/js/expressions/this_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/this_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsThisExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsThisExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsThisExpressionFields { this_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/expressions/unary_expression.rs b/crates/rome_js_formatter/src/js/expressions/unary_expression.rs index 0ad0ff92720..58228f9200e 100644 --- a/crates/rome_js_formatter/src/js/expressions/unary_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/unary_expression.rs @@ -9,7 +9,7 @@ use rome_js_syntax::{JsUnaryExpressionFields, JsUnaryOperator}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnaryExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsUnaryExpressionFields { operator_token, diff --git a/crates/rome_js_formatter/src/js/expressions/yield_argument.rs b/crates/rome_js_formatter/src/js/expressions/yield_argument.rs index 648f20db66c..ecc22257810 100644 --- a/crates/rome_js_formatter/src/js/expressions/yield_argument.rs +++ b/crates/rome_js_formatter/src/js/expressions/yield_argument.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsYieldArgumentFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsYieldArgument, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsYieldArgumentFields { star_token, diff --git a/crates/rome_js_formatter/src/js/expressions/yield_expression.rs b/crates/rome_js_formatter/src/js/expressions/yield_expression.rs index 5d0d3471a95..64f1a0d03eb 100644 --- a/crates/rome_js_formatter/src/js/expressions/yield_expression.rs +++ b/crates/rome_js_formatter/src/js/expressions/yield_expression.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsYieldExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsYieldExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsYieldExpressionFields { yield_token, diff --git a/crates/rome_js_formatter/src/js/lists/array_assignment_pattern_element_list.rs b/crates/rome_js_formatter/src/js/lists/array_assignment_pattern_element_list.rs index 15f973c1242..c26631e1aec 100644 --- a/crates/rome_js_formatter/src/js/lists/array_assignment_pattern_element_list.rs +++ b/crates/rome_js_formatter/src/js/lists/array_assignment_pattern_element_list.rs @@ -4,11 +4,11 @@ use crate::utils::array::format_array_node; use rome_js_syntax::JsArrayAssignmentPatternElementList; impl FormatRule for FormatJsArrayAssignmentPatternElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsArrayAssignmentPatternElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_array_node(node, formatter) } diff --git a/crates/rome_js_formatter/src/js/lists/array_binding_pattern_element_list.rs b/crates/rome_js_formatter/src/js/lists/array_binding_pattern_element_list.rs index f2d6ff246ab..6cb8da727cb 100644 --- a/crates/rome_js_formatter/src/js/lists/array_binding_pattern_element_list.rs +++ b/crates/rome_js_formatter/src/js/lists/array_binding_pattern_element_list.rs @@ -4,11 +4,11 @@ use crate::utils::array::format_array_node; use rome_js_syntax::JsArrayBindingPatternElementList; impl FormatRule for FormatJsArrayBindingPatternElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsArrayBindingPatternElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_array_node(node, formatter) } diff --git a/crates/rome_js_formatter/src/js/lists/array_element_list.rs b/crates/rome_js_formatter/src/js/lists/array_element_list.rs index 3422207bc85..43c036e0110 100644 --- a/crates/rome_js_formatter/src/js/lists/array_element_list.rs +++ b/crates/rome_js_formatter/src/js/lists/array_element_list.rs @@ -11,11 +11,11 @@ use rome_js_syntax::{JsAnyExpression, JsArrayElementList}; use rome_rowan::{AstNode, AstSeparatedList}; impl FormatRule for FormatJsArrayElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsArrayElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Self::format_with_group_id(node, formatter, None) } @@ -25,7 +25,7 @@ impl FormatJsArrayElementList { /// Formats the array list with pub fn format_with_group_id( node: &JsArrayElementList, - formatter: &Formatter, + formatter: &Formatter, group_id: Option, ) -> FormatResult { if !has_formatter_trivia(node.syntax()) && can_print_fill(node) { diff --git a/crates/rome_js_formatter/src/js/lists/call_argument_list.rs b/crates/rome_js_formatter/src/js/lists/call_argument_list.rs index bb846ab4adf..ad917ca62ac 100644 --- a/crates/rome_js_formatter/src/js/lists/call_argument_list.rs +++ b/crates/rome_js_formatter/src/js/lists/call_argument_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsCallArgumentList; impl FormatRule for FormatJsCallArgumentList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsCallArgumentList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/js/lists/class_member_list.rs b/crates/rome_js_formatter/src/js/lists/class_member_list.rs index 228ef0f7538..c9c36db4cec 100644 --- a/crates/rome_js_formatter/src/js/lists/class_member_list.rs +++ b/crates/rome_js_formatter/src/js/lists/class_member_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsClassMemberList; impl FormatRule for FormatJsClassMemberList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsClassMemberList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(formatter.format_list(node)) } diff --git a/crates/rome_js_formatter/src/js/lists/constructor_modifier_list.rs b/crates/rome_js_formatter/src/js/lists/constructor_modifier_list.rs index 9f39b44be5e..38a7c4abd4d 100644 --- a/crates/rome_js_formatter/src/js/lists/constructor_modifier_list.rs +++ b/crates/rome_js_formatter/src/js/lists/constructor_modifier_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::JsConstructorModifierList; use rome_rowan::AstNodeList; impl FormatRule for FormatJsConstructorModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsConstructorModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/js/lists/constructor_parameter_list.rs b/crates/rome_js_formatter/src/js/lists/constructor_parameter_list.rs index 76725dadb15..2c0ca623a7c 100644 --- a/crates/rome_js_formatter/src/js/lists/constructor_parameter_list.rs +++ b/crates/rome_js_formatter/src/js/lists/constructor_parameter_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsConstructorParameterList; impl FormatRule for FormatJsConstructorParameterList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsConstructorParameterList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/js/lists/directive_list.rs b/crates/rome_js_formatter/src/js/lists/directive_list.rs index 5e9a0ccfc7d..f7ad840b7da 100644 --- a/crates/rome_js_formatter/src/js/lists/directive_list.rs +++ b/crates/rome_js_formatter/src/js/lists/directive_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::JsDirectiveList; use rome_rowan::{AstNode, AstNodeList}; impl FormatRule for FormatJsDirectiveList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsDirectiveList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { if !node.is_empty() { let syntax_node = node.syntax(); diff --git a/crates/rome_js_formatter/src/js/lists/export_named_from_specifier_list.rs b/crates/rome_js_formatter/src/js/lists/export_named_from_specifier_list.rs index 8433e3cc375..db3262c8009 100644 --- a/crates/rome_js_formatter/src/js/lists/export_named_from_specifier_list.rs +++ b/crates/rome_js_formatter/src/js/lists/export_named_from_specifier_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsExportNamedFromSpecifierList; impl FormatRule for FormatJsExportNamedFromSpecifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsExportNamedFromSpecifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/js/lists/export_named_specifier_list.rs b/crates/rome_js_formatter/src/js/lists/export_named_specifier_list.rs index 66f9e065d10..7a56c217c8f 100644 --- a/crates/rome_js_formatter/src/js/lists/export_named_specifier_list.rs +++ b/crates/rome_js_formatter/src/js/lists/export_named_specifier_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsExportNamedSpecifierList; impl FormatRule for FormatJsExportNamedSpecifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsExportNamedSpecifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/js/lists/import_assertion_entry_list.rs b/crates/rome_js_formatter/src/js/lists/import_assertion_entry_list.rs index 8e893006be5..8a075b1c275 100644 --- a/crates/rome_js_formatter/src/js/lists/import_assertion_entry_list.rs +++ b/crates/rome_js_formatter/src/js/lists/import_assertion_entry_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsImportAssertionEntryList; impl FormatRule for FormatJsImportAssertionEntryList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsImportAssertionEntryList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/js/lists/method_modifier_list.rs b/crates/rome_js_formatter/src/js/lists/method_modifier_list.rs index d2db1b0bdec..e215e6002d8 100644 --- a/crates/rome_js_formatter/src/js/lists/method_modifier_list.rs +++ b/crates/rome_js_formatter/src/js/lists/method_modifier_list.rs @@ -4,11 +4,11 @@ use crate::utils::sort_modifiers_by_precedence; use rome_js_syntax::JsMethodModifierList; impl FormatRule for FormatJsMethodModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsMethodModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/js/lists/module_item_list.rs b/crates/rome_js_formatter/src/js/lists/module_item_list.rs index 9bf375a65c7..c0a46d35959 100644 --- a/crates/rome_js_formatter/src/js/lists/module_item_list.rs +++ b/crates/rome_js_formatter/src/js/lists/module_item_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsModuleItemList; impl FormatRule for FormatJsModuleItemList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsModuleItemList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(formatter.format_list(node)) } diff --git a/crates/rome_js_formatter/src/js/lists/named_import_specifier_list.rs b/crates/rome_js_formatter/src/js/lists/named_import_specifier_list.rs index 76a9d0caf3d..0b36365cba3 100644 --- a/crates/rome_js_formatter/src/js/lists/named_import_specifier_list.rs +++ b/crates/rome_js_formatter/src/js/lists/named_import_specifier_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsNamedImportSpecifierList; impl FormatRule for FormatJsNamedImportSpecifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsNamedImportSpecifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs b/crates/rome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs index a588e2e9ba5..e8ce46b091a 100644 --- a/crates/rome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs +++ b/crates/rome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs @@ -6,11 +6,11 @@ use rome_js_syntax::{JsAnyObjectAssignmentPatternMember, JsObjectAssignmentPatte impl FormatRule for FormatJsObjectAssignmentPatternPropertyList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsObjectAssignmentPatternPropertyList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { // The trailing separator is disallowed after a rest element let has_trailing_rest = match node.into_iter().last() { diff --git a/crates/rome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs b/crates/rome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs index f2377366939..c669aac5caa 100644 --- a/crates/rome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs +++ b/crates/rome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs @@ -4,11 +4,11 @@ use crate::prelude::*; use rome_js_syntax::{JsAnyObjectBindingPatternMember, JsObjectBindingPatternPropertyList}; impl FormatRule for FormatJsObjectBindingPatternPropertyList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsObjectBindingPatternPropertyList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { // The trailing separator is disallowed after a rest element let has_trailing_rest = match node.into_iter().last() { diff --git a/crates/rome_js_formatter/src/js/lists/object_member_list.rs b/crates/rome_js_formatter/src/js/lists/object_member_list.rs index d5139e9220e..2d854be1030 100644 --- a/crates/rome_js_formatter/src/js/lists/object_member_list.rs +++ b/crates/rome_js_formatter/src/js/lists/object_member_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::JsObjectMemberList; use rome_rowan::{AstNode, AstSeparatedList}; impl FormatRule for FormatJsObjectMemberList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsObjectMemberList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let members = formatter.format_separated(node, || token(","))?; diff --git a/crates/rome_js_formatter/src/js/lists/parameter_list.rs b/crates/rome_js_formatter/src/js/lists/parameter_list.rs index c9a1ff77429..03769d6ba70 100644 --- a/crates/rome_js_formatter/src/js/lists/parameter_list.rs +++ b/crates/rome_js_formatter/src/js/lists/parameter_list.rs @@ -4,11 +4,11 @@ use crate::prelude::*; use rome_js_syntax::{JsAnyParameter, JsParameterList}; impl FormatRule for FormatJsParameterList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsParameterList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { // The trailing separator is disallowed if the last element in the list is a rest parameter let has_trailing_rest = match node.into_iter().last() { diff --git a/crates/rome_js_formatter/src/js/lists/property_modifier_list.rs b/crates/rome_js_formatter/src/js/lists/property_modifier_list.rs index cdbbac89b29..a0efc252575 100644 --- a/crates/rome_js_formatter/src/js/lists/property_modifier_list.rs +++ b/crates/rome_js_formatter/src/js/lists/property_modifier_list.rs @@ -4,11 +4,11 @@ use crate::utils::sort_modifiers_by_precedence; use rome_js_syntax::JsPropertyModifierList; impl FormatRule for FormatJsPropertyModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsPropertyModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/js/lists/statement_list.rs b/crates/rome_js_formatter/src/js/lists/statement_list.rs index bee4099d7c8..805c85e5f8b 100644 --- a/crates/rome_js_formatter/src/js/lists/statement_list.rs +++ b/crates/rome_js_formatter/src/js/lists/statement_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsStatementList; impl FormatRule for FormatJsStatementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsStatementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(formatter.format_list(node)) } diff --git a/crates/rome_js_formatter/src/js/lists/switch_case_list.rs b/crates/rome_js_formatter/src/js/lists/switch_case_list.rs index 5f66b339660..9d4d382695e 100644 --- a/crates/rome_js_formatter/src/js/lists/switch_case_list.rs +++ b/crates/rome_js_formatter/src/js/lists/switch_case_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsSwitchCaseList; impl FormatRule for FormatJsSwitchCaseList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsSwitchCaseList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(formatter.format_list(node)) } diff --git a/crates/rome_js_formatter/src/js/lists/template_element_list.rs b/crates/rome_js_formatter/src/js/lists/template_element_list.rs index cdd556378b1..9ed3f2d0dec 100644 --- a/crates/rome_js_formatter/src/js/lists/template_element_list.rs +++ b/crates/rome_js_formatter/src/js/lists/template_element_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsTemplateElementList; impl FormatRule for FormatJsTemplateElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsTemplateElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(concat_elements( formatter diff --git a/crates/rome_js_formatter/src/js/lists/variable_declarator_list.rs b/crates/rome_js_formatter/src/js/lists/variable_declarator_list.rs index 3cbcf6c37d2..6537fc65252 100644 --- a/crates/rome_js_formatter/src/js/lists/variable_declarator_list.rs +++ b/crates/rome_js_formatter/src/js/lists/variable_declarator_list.rs @@ -6,11 +6,11 @@ use rome_js_syntax::JsVariableDeclaratorList; use rome_rowan::AstSeparatedList; impl FormatRule for FormatJsVariableDeclaratorList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsVariableDeclaratorList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let last_index = node.len().saturating_sub(1); diff --git a/crates/rome_js_formatter/src/js/module/default_import_specifier.rs b/crates/rome_js_formatter/src/js/module/default_import_specifier.rs index 4c7c2043401..6d4b1ce1e88 100644 --- a/crates/rome_js_formatter/src/js/module/default_import_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/default_import_specifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsDefaultImportSpecifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsDefaultImportSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsDefaultImportSpecifierFields { local_name, diff --git a/crates/rome_js_formatter/src/js/module/export.rs b/crates/rome_js_formatter/src/js/module/export.rs index 9383f2934e3..f352f1d1552 100644 --- a/crates/rome_js_formatter/src/js/module/export.rs +++ b/crates/rome_js_formatter/src/js/module/export.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsExportFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExport, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportFields { export_token, diff --git a/crates/rome_js_formatter/src/js/module/export_as_clause.rs b/crates/rome_js_formatter/src/js/module/export_as_clause.rs index 488079ae948..ce97aee48fc 100644 --- a/crates/rome_js_formatter/src/js/module/export_as_clause.rs +++ b/crates/rome_js_formatter/src/js/module/export_as_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsExportAsClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExportAsClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportAsClauseFields { as_token, diff --git a/crates/rome_js_formatter/src/js/module/export_default_declaration_clause.rs b/crates/rome_js_formatter/src/js/module/export_default_declaration_clause.rs index eacd6b7a262..2743bde9c60 100644 --- a/crates/rome_js_formatter/src/js/module/export_default_declaration_clause.rs +++ b/crates/rome_js_formatter/src/js/module/export_default_declaration_clause.rs @@ -7,7 +7,7 @@ impl FormatNodeFields { fn format_fields( node: &JsExportDefaultDeclarationClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportDefaultDeclarationClauseFields { default_token, diff --git a/crates/rome_js_formatter/src/js/module/export_default_expression_clause.rs b/crates/rome_js_formatter/src/js/module/export_default_expression_clause.rs index 57d0abb0aea..a7465c954af 100644 --- a/crates/rome_js_formatter/src/js/module/export_default_expression_clause.rs +++ b/crates/rome_js_formatter/src/js/module/export_default_expression_clause.rs @@ -10,7 +10,7 @@ impl FormatNodeFields { fn format_fields( node: &JsExportDefaultExpressionClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportDefaultExpressionClauseFields { default_token, diff --git a/crates/rome_js_formatter/src/js/module/export_from_clause.rs b/crates/rome_js_formatter/src/js/module/export_from_clause.rs index 16bbd23bbd1..4093de86e09 100644 --- a/crates/rome_js_formatter/src/js/module/export_from_clause.rs +++ b/crates/rome_js_formatter/src/js/module/export_from_clause.rs @@ -9,7 +9,7 @@ use rome_js_syntax::JsExportFromClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExportFromClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportFromClauseFields { star_token, diff --git a/crates/rome_js_formatter/src/js/module/export_named_clause.rs b/crates/rome_js_formatter/src/js/module/export_named_clause.rs index 9e52f93b38c..330d32a83a4 100644 --- a/crates/rome_js_formatter/src/js/module/export_named_clause.rs +++ b/crates/rome_js_formatter/src/js/module/export_named_clause.rs @@ -9,7 +9,7 @@ use rome_js_syntax::JsExportNamedClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExportNamedClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportNamedClauseFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/export_named_from_clause.rs b/crates/rome_js_formatter/src/js/module/export_named_from_clause.rs index 22367c7f8bc..8df798a0347 100644 --- a/crates/rome_js_formatter/src/js/module/export_named_from_clause.rs +++ b/crates/rome_js_formatter/src/js/module/export_named_from_clause.rs @@ -10,7 +10,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExportNamedFromClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportNamedFromClauseFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/export_named_from_specifier.rs b/crates/rome_js_formatter/src/js/module/export_named_from_specifier.rs index b5a2a8d6a52..aeb87eccf29 100644 --- a/crates/rome_js_formatter/src/js/module/export_named_from_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/export_named_from_specifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsExportNamedFromSpecifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExportNamedFromSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportNamedFromSpecifierFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/export_named_shorthand_specifier.rs b/crates/rome_js_formatter/src/js/module/export_named_shorthand_specifier.rs index a6264395f7b..8e804306e64 100644 --- a/crates/rome_js_formatter/src/js/module/export_named_shorthand_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/export_named_shorthand_specifier.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsExportNamedShorthandSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportNamedShorthandSpecifierFields { type_token, name } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/module/export_named_specifier.rs b/crates/rome_js_formatter/src/js/module/export_named_specifier.rs index d72e4da53ca..7fc3de4598f 100644 --- a/crates/rome_js_formatter/src/js/module/export_named_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/export_named_specifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsExportNamedSpecifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExportNamedSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExportNamedSpecifierFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/import.rs b/crates/rome_js_formatter/src/js/module/import.rs index d666f463611..ba17a340e9e 100644 --- a/crates/rome_js_formatter/src/js/module/import.rs +++ b/crates/rome_js_formatter/src/js/module/import.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsImportFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImport, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportFields { import_token, diff --git a/crates/rome_js_formatter/src/js/module/import_assertion.rs b/crates/rome_js_formatter/src/js/module/import_assertion.rs index 7083dc816db..2936c285f66 100644 --- a/crates/rome_js_formatter/src/js/module/import_assertion.rs +++ b/crates/rome_js_formatter/src/js/module/import_assertion.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsImportAssertionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportAssertion, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportAssertionFields { assert_token, diff --git a/crates/rome_js_formatter/src/js/module/import_assertion_entry.rs b/crates/rome_js_formatter/src/js/module/import_assertion_entry.rs index 6a0c8ab979e..a59fe210dee 100644 --- a/crates/rome_js_formatter/src/js/module/import_assertion_entry.rs +++ b/crates/rome_js_formatter/src/js/module/import_assertion_entry.rs @@ -8,7 +8,7 @@ use rome_js_syntax::{JsImportAssertionEntry, JsSyntaxKind}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportAssertionEntry, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportAssertionEntryFields { key, diff --git a/crates/rome_js_formatter/src/js/module/import_bare_clause.rs b/crates/rome_js_formatter/src/js/module/import_bare_clause.rs index 99107d32dab..3e28c1aaf3b 100644 --- a/crates/rome_js_formatter/src/js/module/import_bare_clause.rs +++ b/crates/rome_js_formatter/src/js/module/import_bare_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsImportBareClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportBareClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportBareClauseFields { source, assertion } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/module/import_default_clause.rs b/crates/rome_js_formatter/src/js/module/import_default_clause.rs index e131b63df9b..1db5301598d 100644 --- a/crates/rome_js_formatter/src/js/module/import_default_clause.rs +++ b/crates/rome_js_formatter/src/js/module/import_default_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsImportDefaultClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportDefaultClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportDefaultClauseFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/import_meta.rs b/crates/rome_js_formatter/src/js/module/import_meta.rs index 50918e76045..83b903c74aa 100644 --- a/crates/rome_js_formatter/src/js/module/import_meta.rs +++ b/crates/rome_js_formatter/src/js/module/import_meta.rs @@ -7,7 +7,7 @@ use rome_js_syntax::ImportMetaFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &ImportMeta, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let ImportMetaFields { import_token, diff --git a/crates/rome_js_formatter/src/js/module/import_named_clause.rs b/crates/rome_js_formatter/src/js/module/import_named_clause.rs index 8d156a9b4b9..6f6ec5fb09f 100644 --- a/crates/rome_js_formatter/src/js/module/import_named_clause.rs +++ b/crates/rome_js_formatter/src/js/module/import_named_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsImportNamedClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportNamedClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportNamedClauseFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/import_namespace_clause.rs b/crates/rome_js_formatter/src/js/module/import_namespace_clause.rs index 43470f44c4e..1ea8e241281 100644 --- a/crates/rome_js_formatter/src/js/module/import_namespace_clause.rs +++ b/crates/rome_js_formatter/src/js/module/import_namespace_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsImportNamespaceClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsImportNamespaceClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsImportNamespaceClauseFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/literal_export_name.rs b/crates/rome_js_formatter/src/js/module/literal_export_name.rs index a019632cfb3..60518ee2d84 100644 --- a/crates/rome_js_formatter/src/js/module/literal_export_name.rs +++ b/crates/rome_js_formatter/src/js/module/literal_export_name.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsLiteralExportNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsLiteralExportName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsLiteralExportNameFields { value } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/module/module_source.rs b/crates/rome_js_formatter/src/js/module/module_source.rs index 62237d84017..1365e1787bd 100644 --- a/crates/rome_js_formatter/src/js/module/module_source.rs +++ b/crates/rome_js_formatter/src/js/module/module_source.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsModuleSourceFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsModuleSource, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsModuleSourceFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/module/named_import_specifier.rs b/crates/rome_js_formatter/src/js/module/named_import_specifier.rs index 503dad17a2e..72da2bb23f6 100644 --- a/crates/rome_js_formatter/src/js/module/named_import_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/named_import_specifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNamedImportSpecifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsNamedImportSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNamedImportSpecifierFields { type_token, diff --git a/crates/rome_js_formatter/src/js/module/named_import_specifiers.rs b/crates/rome_js_formatter/src/js/module/named_import_specifiers.rs index 320876cf7fd..6d4d465ac50 100644 --- a/crates/rome_js_formatter/src/js/module/named_import_specifiers.rs +++ b/crates/rome_js_formatter/src/js/module/named_import_specifiers.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNamedImportSpecifiersFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsNamedImportSpecifiers, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNamedImportSpecifiersFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/js/module/namespace_import_specifier.rs b/crates/rome_js_formatter/src/js/module/namespace_import_specifier.rs index 9c1fa05c763..ef78233eee6 100644 --- a/crates/rome_js_formatter/src/js/module/namespace_import_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/namespace_import_specifier.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsNamespaceImportSpecifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsNamespaceImportSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsNamespaceImportSpecifierFields { star_token, diff --git a/crates/rome_js_formatter/src/js/module/shorthand_named_import_specifier.rs b/crates/rome_js_formatter/src/js/module/shorthand_named_import_specifier.rs index 0d9f6e2af3b..5767fae9cd6 100644 --- a/crates/rome_js_formatter/src/js/module/shorthand_named_import_specifier.rs +++ b/crates/rome_js_formatter/src/js/module/shorthand_named_import_specifier.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsShorthandNamedImportSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsShorthandNamedImportSpecifierFields { type_token, diff --git a/crates/rome_js_formatter/src/js/objects/computed_member_name.rs b/crates/rome_js_formatter/src/js/objects/computed_member_name.rs index 4e1a1502c19..1260592da60 100644 --- a/crates/rome_js_formatter/src/js/objects/computed_member_name.rs +++ b/crates/rome_js_formatter/src/js/objects/computed_member_name.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsComputedMemberNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsComputedMemberName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsComputedMemberNameFields { l_brack_token, diff --git a/crates/rome_js_formatter/src/js/objects/getter_object_member.rs b/crates/rome_js_formatter/src/js/objects/getter_object_member.rs index a7749e1e8b4..e8e99d603d4 100644 --- a/crates/rome_js_formatter/src/js/objects/getter_object_member.rs +++ b/crates/rome_js_formatter/src/js/objects/getter_object_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsGetterObjectMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsGetterObjectMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsGetterObjectMemberFields { get_token, diff --git a/crates/rome_js_formatter/src/js/objects/literal_member_name.rs b/crates/rome_js_formatter/src/js/objects/literal_member_name.rs index 2665baa25cc..4ef97c4ffe2 100644 --- a/crates/rome_js_formatter/src/js/objects/literal_member_name.rs +++ b/crates/rome_js_formatter/src/js/objects/literal_member_name.rs @@ -8,7 +8,7 @@ use rome_js_syntax::{JsLiteralMemberName, JsSyntaxKind}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsLiteralMemberName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsLiteralMemberNameFields { value } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/objects/method_object_member.rs b/crates/rome_js_formatter/src/js/objects/method_object_member.rs index f0e631f7efa..562b0732b7c 100644 --- a/crates/rome_js_formatter/src/js/objects/method_object_member.rs +++ b/crates/rome_js_formatter/src/js/objects/method_object_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsMethodObjectMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsMethodObjectMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsMethodObjectMemberFields { async_token, diff --git a/crates/rome_js_formatter/src/js/objects/private_class_member_name.rs b/crates/rome_js_formatter/src/js/objects/private_class_member_name.rs index f1c669aa7c7..d96506024dc 100644 --- a/crates/rome_js_formatter/src/js/objects/private_class_member_name.rs +++ b/crates/rome_js_formatter/src/js/objects/private_class_member_name.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsPrivateClassMemberNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsPrivateClassMemberName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsPrivateClassMemberNameFields { hash_token, diff --git a/crates/rome_js_formatter/src/js/objects/property_object_member.rs b/crates/rome_js_formatter/src/js/objects/property_object_member.rs index 5bac7d9aec5..2756d18edc3 100644 --- a/crates/rome_js_formatter/src/js/objects/property_object_member.rs +++ b/crates/rome_js_formatter/src/js/objects/property_object_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsPropertyObjectMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsPropertyObjectMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsPropertyObjectMemberFields { name, diff --git a/crates/rome_js_formatter/src/js/objects/setter_object_member.rs b/crates/rome_js_formatter/src/js/objects/setter_object_member.rs index 220d9039900..d9b22bfe541 100644 --- a/crates/rome_js_formatter/src/js/objects/setter_object_member.rs +++ b/crates/rome_js_formatter/src/js/objects/setter_object_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsSetterObjectMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsSetterObjectMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsSetterObjectMemberFields { set_token, diff --git a/crates/rome_js_formatter/src/js/objects/shorthand_property_object_member.rs b/crates/rome_js_formatter/src/js/objects/shorthand_property_object_member.rs index 3fce47a45b4..a26bb6549c6 100644 --- a/crates/rome_js_formatter/src/js/objects/shorthand_property_object_member.rs +++ b/crates/rome_js_formatter/src/js/objects/shorthand_property_object_member.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &JsShorthandPropertyObjectMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsShorthandPropertyObjectMemberFields { name } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/js/statements/block_statement.rs b/crates/rome_js_formatter/src/js/statements/block_statement.rs index ce707ce8b53..e816abfaf09 100644 --- a/crates/rome_js_formatter/src/js/statements/block_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/block_statement.rs @@ -11,7 +11,7 @@ use rome_rowan::{AstNode, AstNodeList}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsBlockStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsBlockStatementFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/js/statements/break_statement.rs b/crates/rome_js_formatter/src/js/statements/break_statement.rs index 86b4c97a448..436d97fb824 100644 --- a/crates/rome_js_formatter/src/js/statements/break_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/break_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsBreakStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsBreakStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsBreakStatementFields { break_token, diff --git a/crates/rome_js_formatter/src/js/statements/continue_statement.rs b/crates/rome_js_formatter/src/js/statements/continue_statement.rs index 1e3ebb0c1c4..6d6b3b8fcd9 100644 --- a/crates/rome_js_formatter/src/js/statements/continue_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/continue_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsContinueStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsContinueStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsContinueStatementFields { continue_token, diff --git a/crates/rome_js_formatter/src/js/statements/debugger_statement.rs b/crates/rome_js_formatter/src/js/statements/debugger_statement.rs index 461b9b42ea9..047dac0821f 100644 --- a/crates/rome_js_formatter/src/js/statements/debugger_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/debugger_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsDebuggerStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsDebuggerStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsDebuggerStatementFields { debugger_token, diff --git a/crates/rome_js_formatter/src/js/statements/do_while_statement.rs b/crates/rome_js_formatter/src/js/statements/do_while_statement.rs index 9a2690c3581..e4019c504bf 100644 --- a/crates/rome_js_formatter/src/js/statements/do_while_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/do_while_statement.rs @@ -7,7 +7,7 @@ use rome_js_syntax::{JsAnyStatement, JsDoWhileStatement}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsDoWhileStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsDoWhileStatementFields { do_token, diff --git a/crates/rome_js_formatter/src/js/statements/empty_statement.rs b/crates/rome_js_formatter/src/js/statements/empty_statement.rs index 1e5e6c5b191..1497f697253 100644 --- a/crates/rome_js_formatter/src/js/statements/empty_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/empty_statement.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsEmptyStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsEmptyStatementFields { semicolon_token } = node.as_fields(); let parent_kind = node.syntax().parent().map(|p| p.kind()); diff --git a/crates/rome_js_formatter/src/js/statements/expression_statement.rs b/crates/rome_js_formatter/src/js/statements/expression_statement.rs index c36cc56b861..1158e6633a3 100644 --- a/crates/rome_js_formatter/src/js/statements/expression_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/expression_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsExpressionStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsExpressionStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsExpressionStatementFields { expression, diff --git a/crates/rome_js_formatter/src/js/statements/for_in_statement.rs b/crates/rome_js_formatter/src/js/statements/for_in_statement.rs index 40e75678c5b..dfb53a86685 100644 --- a/crates/rome_js_formatter/src/js/statements/for_in_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/for_in_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsForInStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsForInStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsForInStatementFields { for_token, diff --git a/crates/rome_js_formatter/src/js/statements/for_of_statement.rs b/crates/rome_js_formatter/src/js/statements/for_of_statement.rs index 7f910a7ef48..98824c7a9d3 100644 --- a/crates/rome_js_formatter/src/js/statements/for_of_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/for_of_statement.rs @@ -9,7 +9,7 @@ use rome_js_syntax::JsForOfStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsForOfStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsForOfStatementFields { for_token, diff --git a/crates/rome_js_formatter/src/js/statements/for_statement.rs b/crates/rome_js_formatter/src/js/statements/for_statement.rs index da06ebf90af..39ef81e1139 100644 --- a/crates/rome_js_formatter/src/js/statements/for_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/for_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsForStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsForStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsForStatementFields { for_token, diff --git a/crates/rome_js_formatter/src/js/statements/if_statement.rs b/crates/rome_js_formatter/src/js/statements/if_statement.rs index 21568ce67b9..ce6ece8160d 100644 --- a/crates/rome_js_formatter/src/js/statements/if_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/if_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::{JsElseClause, JsIfStatementFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsIfStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let (head, mut else_clause) = format_if_element(formatter, None, node)?; @@ -45,7 +45,7 @@ impl FormatNodeFields for FormatNodeRule { /// Format a single `else? if(test) consequent` element, returning the next else clause fn format_if_element( - formatter: &Formatter, + formatter: &Formatter, else_token: Option, stmt: &JsIfStatement, ) -> FormatResult<(FormatElement, Option)> { @@ -84,7 +84,7 @@ fn format_if_element( /// Wraps the statement into a block if its not already a JsBlockStatement fn into_block( - formatter: &Formatter, + formatter: &Formatter, stmt: JsAnyStatement, ) -> FormatResult { if matches!(stmt, JsAnyStatement::JsBlockStatement(_)) { diff --git a/crates/rome_js_formatter/src/js/statements/labeled_statement.rs b/crates/rome_js_formatter/src/js/statements/labeled_statement.rs index 2f948b42fa2..d9c706aea9d 100644 --- a/crates/rome_js_formatter/src/js/statements/labeled_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/labeled_statement.rs @@ -7,7 +7,7 @@ use rome_js_syntax::{JsAnyStatement, JsLabeledStatement}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsLabeledStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsLabeledStatementFields { label_token, diff --git a/crates/rome_js_formatter/src/js/statements/return_statement.rs b/crates/rome_js_formatter/src/js/statements/return_statement.rs index bb8734cb4c9..949138f560b 100644 --- a/crates/rome_js_formatter/src/js/statements/return_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/return_statement.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsReturnStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsReturnStatementFields { return_token, diff --git a/crates/rome_js_formatter/src/js/statements/switch_statement.rs b/crates/rome_js_formatter/src/js/statements/switch_statement.rs index 3f6af510f1c..b8e2f63624b 100644 --- a/crates/rome_js_formatter/src/js/statements/switch_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/switch_statement.rs @@ -6,7 +6,7 @@ use rome_rowan::{AstNode, AstNodeList}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsSwitchStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsSwitchStatementFields { switch_token, diff --git a/crates/rome_js_formatter/src/js/statements/throw_statement.rs b/crates/rome_js_formatter/src/js/statements/throw_statement.rs index 288f49577c5..b33999b42a4 100644 --- a/crates/rome_js_formatter/src/js/statements/throw_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/throw_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsThrowStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsThrowStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsThrowStatementFields { throw_token, diff --git a/crates/rome_js_formatter/src/js/statements/try_finally_statement.rs b/crates/rome_js_formatter/src/js/statements/try_finally_statement.rs index ceadaff410d..a44bc18db56 100644 --- a/crates/rome_js_formatter/src/js/statements/try_finally_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/try_finally_statement.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsTryFinallyStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsTryFinallyStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsTryFinallyStatementFields { try_token, diff --git a/crates/rome_js_formatter/src/js/statements/try_statement.rs b/crates/rome_js_formatter/src/js/statements/try_statement.rs index 31eeccdc2d8..8296fa4e1d3 100644 --- a/crates/rome_js_formatter/src/js/statements/try_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/try_statement.rs @@ -7,7 +7,7 @@ use rome_js_syntax::JsTryStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsTryStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsTryStatementFields { try_token, diff --git a/crates/rome_js_formatter/src/js/statements/variable_statement.rs b/crates/rome_js_formatter/src/js/statements/variable_statement.rs index c2154bab87d..2237b7bf765 100644 --- a/crates/rome_js_formatter/src/js/statements/variable_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/variable_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsVariableStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsVariableStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsVariableStatementFields { declaration, diff --git a/crates/rome_js_formatter/src/js/statements/while_statement.rs b/crates/rome_js_formatter/src/js/statements/while_statement.rs index 4fa7682bdd2..ec5fd1a20b1 100644 --- a/crates/rome_js_formatter/src/js/statements/while_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/while_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsWhileStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsWhileStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsWhileStatementFields { while_token, diff --git a/crates/rome_js_formatter/src/js/statements/with_statement.rs b/crates/rome_js_formatter/src/js/statements/with_statement.rs index 39060dfb17a..52d55d4f425 100644 --- a/crates/rome_js_formatter/src/js/statements/with_statement.rs +++ b/crates/rome_js_formatter/src/js/statements/with_statement.rs @@ -8,7 +8,7 @@ use rome_js_syntax::JsWithStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsWithStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsWithStatementFields { with_token, diff --git a/crates/rome_js_formatter/src/js/unknown/unknown.rs b/crates/rome_js_formatter/src/js/unknown/unknown.rs index 1967027649a..14a604db388 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknown, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_assignment.rs b/crates/rome_js_formatter/src/js/unknown/unknown_assignment.rs index 0bd531f584c..3c25d666992 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_assignment.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_assignment.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknownAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_binding.rs b/crates/rome_js_formatter/src/js/unknown/unknown_binding.rs index 031ed3694bf..b857e8a0c64 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_binding.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_binding.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknownBinding, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_expression.rs b/crates/rome_js_formatter/src/js/unknown/unknown_expression.rs index 21a0133b998..e2752242aa6 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_expression.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_expression.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknownExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_import_assertion_entry.rs b/crates/rome_js_formatter/src/js/unknown/unknown_import_assertion_entry.rs index aeefed6caff..a1f792e813d 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_import_assertion_entry.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_import_assertion_entry.rs @@ -10,7 +10,7 @@ impl FormatNodeFields { fn format_fields( node: &JsUnknownImportAssertionEntry, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_member.rs b/crates/rome_js_formatter/src/js/unknown/unknown_member.rs index a15f9022e09..e05e80635d6 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_member.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_member.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknownMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_named_import_specifier.rs b/crates/rome_js_formatter/src/js/unknown/unknown_named_import_specifier.rs index 881ba2c20ae..601a53a67ef 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_named_import_specifier.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_named_import_specifier.rs @@ -10,7 +10,7 @@ impl FormatNodeFields { fn format_fields( node: &JsUnknownNamedImportSpecifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_parameter.rs b/crates/rome_js_formatter/src/js/unknown/unknown_parameter.rs index dec324f367d..6643557098e 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_parameter.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_parameter.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknownParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/js/unknown/unknown_statement.rs b/crates/rome_js_formatter/src/js/unknown/unknown_statement.rs index 8ba23b69e25..30d95769886 100644 --- a/crates/rome_js_formatter/src/js/unknown/unknown_statement.rs +++ b/crates/rome_js_formatter/src/js/unknown/unknown_statement.rs @@ -8,7 +8,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsUnknownStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { unknown_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/any/attribute.rs b/crates/rome_js_formatter/src/jsx/any/attribute.rs index 0fd81169025..1e061aabb4e 100644 --- a/crates/rome_js_formatter/src/jsx/any/attribute.rs +++ b/crates/rome_js_formatter/src/jsx/any/attribute.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyAttribute; use crate::prelude::*; use rome_js_syntax::JsxAnyAttribute; impl FormatRule for FormatJsxAnyAttribute { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyAttribute, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyAttribute::JsxAttribute(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/any/attribute_name.rs b/crates/rome_js_formatter/src/jsx/any/attribute_name.rs index 97b2c48f38d..f00162ef015 100644 --- a/crates/rome_js_formatter/src/jsx/any/attribute_name.rs +++ b/crates/rome_js_formatter/src/jsx/any/attribute_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyAttributeName; use crate::prelude::*; use rome_js_syntax::JsxAnyAttributeName; impl FormatRule for FormatJsxAnyAttributeName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyAttributeName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyAttributeName::JsxName(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/any/attribute_value.rs b/crates/rome_js_formatter/src/jsx/any/attribute_value.rs index db7e89fce31..1c0e088d868 100644 --- a/crates/rome_js_formatter/src/jsx/any/attribute_value.rs +++ b/crates/rome_js_formatter/src/jsx/any/attribute_value.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyAttributeValue; use crate::prelude::*; use rome_js_syntax::JsxAnyAttributeValue; impl FormatRule for FormatJsxAnyAttributeValue { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyAttributeValue, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyAttributeValue::JsxAnyTag(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/any/child.rs b/crates/rome_js_formatter/src/jsx/any/child.rs index 1241d1e68af..c7e91cbf35c 100644 --- a/crates/rome_js_formatter/src/jsx/any/child.rs +++ b/crates/rome_js_formatter/src/jsx/any/child.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyChild; use crate::prelude::*; use rome_js_syntax::JsxAnyChild; impl FormatRule for FormatJsxAnyChild { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyChild, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyChild::JsxElement(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/any/element_name.rs b/crates/rome_js_formatter/src/jsx/any/element_name.rs index 7a386521718..f3b2c7e1aca 100644 --- a/crates/rome_js_formatter/src/jsx/any/element_name.rs +++ b/crates/rome_js_formatter/src/jsx/any/element_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyElementName; use crate::prelude::*; use rome_js_syntax::JsxAnyElementName; impl FormatRule for FormatJsxAnyElementName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyElementName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyElementName::JsxName(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/any/name.rs b/crates/rome_js_formatter/src/jsx/any/name.rs index 0dae708298c..78042fb44d2 100644 --- a/crates/rome_js_formatter/src/jsx/any/name.rs +++ b/crates/rome_js_formatter/src/jsx/any/name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyName; use crate::prelude::*; use rome_js_syntax::JsxAnyName; impl FormatRule for FormatJsxAnyName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyName::JsxName(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/any/object_name.rs b/crates/rome_js_formatter/src/jsx/any/object_name.rs index a4e347c5bb4..cfc292e9a9f 100644 --- a/crates/rome_js_formatter/src/jsx/any/object_name.rs +++ b/crates/rome_js_formatter/src/jsx/any/object_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyObjectName; use crate::prelude::*; use rome_js_syntax::JsxAnyObjectName; impl FormatRule for FormatJsxAnyObjectName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyObjectName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyObjectName::JsxReferenceIdentifier(node) => { diff --git a/crates/rome_js_formatter/src/jsx/any/tag.rs b/crates/rome_js_formatter/src/jsx/any/tag.rs index 7ba3fe83e12..312c3cd2080 100644 --- a/crates/rome_js_formatter/src/jsx/any/tag.rs +++ b/crates/rome_js_formatter/src/jsx/any/tag.rs @@ -4,10 +4,10 @@ use crate::generated::FormatJsxAnyTag; use crate::prelude::*; use rome_js_syntax::JsxAnyTag; impl FormatRule for FormatJsxAnyTag { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAnyTag, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { JsxAnyTag::JsxElement(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/jsx/attribute/attribute.rs b/crates/rome_js_formatter/src/jsx/attribute/attribute.rs index 6b74552018b..e22a692d496 100644 --- a/crates/rome_js_formatter/src/jsx/attribute/attribute.rs +++ b/crates/rome_js_formatter/src/jsx/attribute/attribute.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxAttribute, JsxAttributeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxAttribute, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxAttributeFields { name, initializer } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/jsx/attribute/attribute_initializer_clause.rs b/crates/rome_js_formatter/src/jsx/attribute/attribute_initializer_clause.rs index 980e97bfc10..49444d5b918 100644 --- a/crates/rome_js_formatter/src/jsx/attribute/attribute_initializer_clause.rs +++ b/crates/rome_js_formatter/src/jsx/attribute/attribute_initializer_clause.rs @@ -7,7 +7,7 @@ impl FormatNodeFields { fn format_fields( node: &JsxAttributeInitializerClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxAttributeInitializerClauseFields { eq_token, value } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/jsx/attribute/expression_attribute_value.rs b/crates/rome_js_formatter/src/jsx/attribute/expression_attribute_value.rs index fc0547daec9..0fc24d7af12 100644 --- a/crates/rome_js_formatter/src/jsx/attribute/expression_attribute_value.rs +++ b/crates/rome_js_formatter/src/jsx/attribute/expression_attribute_value.rs @@ -7,7 +7,7 @@ use rome_js_syntax::{ impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxExpressionAttributeValue, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxExpressionAttributeValueFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/jsx/attribute/spread_attribute.rs b/crates/rome_js_formatter/src/jsx/attribute/spread_attribute.rs index 54974d5510e..30dfd854a63 100644 --- a/crates/rome_js_formatter/src/jsx/attribute/spread_attribute.rs +++ b/crates/rome_js_formatter/src/jsx/attribute/spread_attribute.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxSpreadAttribute, JsxSpreadAttributeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxSpreadAttribute, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxSpreadAttributeFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/expression_child.rs b/crates/rome_js_formatter/src/jsx/auxiliary/expression_child.rs index 92579811854..4e19a394752 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/expression_child.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/expression_child.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxExpressionChild, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/name.rs b/crates/rome_js_formatter/src/jsx/auxiliary/name.rs index 2205e5b2997..68f3b716d4c 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/name.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/name.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxName, JsxNameFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxNameFields { value_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/namespace_name.rs b/crates/rome_js_formatter/src/jsx/auxiliary/namespace_name.rs index a689572ba04..c75c0873380 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/namespace_name.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/namespace_name.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxNamespaceName, JsxNamespaceNameFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxNamespaceName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxNamespaceNameFields { namespace, diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/reference_identifier.rs b/crates/rome_js_formatter/src/jsx/auxiliary/reference_identifier.rs index f5bae6b1b44..e3ad587888f 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/reference_identifier.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/reference_identifier.rs @@ -5,7 +5,7 @@ use rome_js_syntax::JsxReferenceIdentifier; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxReferenceIdentifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [node.value_token().format()]] } diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/spread_child.rs b/crates/rome_js_formatter/src/jsx/auxiliary/spread_child.rs index 43dc600b690..59832023962 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/spread_child.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/spread_child.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxSpreadChild, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/string.rs b/crates/rome_js_formatter/src/jsx/auxiliary/string.rs index 592ce3d2491..185ec04d2f2 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/string.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/string.rs @@ -5,7 +5,7 @@ use rome_js_syntax::JsxString; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxString, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [node.value_token().format()]] } diff --git a/crates/rome_js_formatter/src/jsx/auxiliary/text.rs b/crates/rome_js_formatter/src/jsx/auxiliary/text.rs index 4dc83afd5d7..735da580e18 100644 --- a/crates/rome_js_formatter/src/jsx/auxiliary/text.rs +++ b/crates/rome_js_formatter/src/jsx/auxiliary/text.rs @@ -8,7 +8,7 @@ use std::str::CharIndices; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxText, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxTextFields { value_token } = node.as_fields(); let token = value_token?; diff --git a/crates/rome_js_formatter/src/jsx/expressions/tag_expression.rs b/crates/rome_js_formatter/src/jsx/expressions/tag_expression.rs index aed954e2650..291480a292e 100644 --- a/crates/rome_js_formatter/src/jsx/expressions/tag_expression.rs +++ b/crates/rome_js_formatter/src/jsx/expressions/tag_expression.rs @@ -5,7 +5,7 @@ use rome_js_syntax::JsxTagExpression; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxTagExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![formatter, [node.tag().format()]] } diff --git a/crates/rome_js_formatter/src/jsx/lists/attribute_list.rs b/crates/rome_js_formatter/src/jsx/lists/attribute_list.rs index 67741735747..66799c41abf 100644 --- a/crates/rome_js_formatter/src/jsx/lists/attribute_list.rs +++ b/crates/rome_js_formatter/src/jsx/lists/attribute_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::JsxAttributeList; impl FormatRule for FormatJsxAttributeList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxAttributeList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let attributes = join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/jsx/lists/child_list.rs b/crates/rome_js_formatter/src/jsx/lists/child_list.rs index 1404a142fca..e920d96c570 100644 --- a/crates/rome_js_formatter/src/jsx/lists/child_list.rs +++ b/crates/rome_js_formatter/src/jsx/lists/child_list.rs @@ -5,11 +5,11 @@ use rome_js_syntax::JsxChildList; use rome_rowan::AstNode; impl FormatRule for FormatJsxChildList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &JsxChildList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/objects/member_name.rs b/crates/rome_js_formatter/src/jsx/objects/member_name.rs index 2813721bd6a..b6fa7c4e490 100644 --- a/crates/rome_js_formatter/src/jsx/objects/member_name.rs +++ b/crates/rome_js_formatter/src/jsx/objects/member_name.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxMemberName, JsxMemberNameFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxMemberName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxMemberNameFields { object, diff --git a/crates/rome_js_formatter/src/jsx/tag/closing_element.rs b/crates/rome_js_formatter/src/jsx/tag/closing_element.rs index 51d906639b4..b8984fb3e0a 100644 --- a/crates/rome_js_formatter/src/jsx/tag/closing_element.rs +++ b/crates/rome_js_formatter/src/jsx/tag/closing_element.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxClosingElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/tag/closing_fragment.rs b/crates/rome_js_formatter/src/jsx/tag/closing_fragment.rs index 0354171407d..f6e209e4c89 100644 --- a/crates/rome_js_formatter/src/jsx/tag/closing_fragment.rs +++ b/crates/rome_js_formatter/src/jsx/tag/closing_fragment.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxClosingFragment, JsxClosingFragmentFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxClosingFragment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxClosingFragmentFields { r_angle_token, diff --git a/crates/rome_js_formatter/src/jsx/tag/element.rs b/crates/rome_js_formatter/src/jsx/tag/element.rs index a6b027d32b9..5236f519171 100644 --- a/crates/rome_js_formatter/src/jsx/tag/element.rs +++ b/crates/rome_js_formatter/src/jsx/tag/element.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/tag/fragment.rs b/crates/rome_js_formatter/src/jsx/tag/fragment.rs index 72e70573d9a..6e644661cf3 100644 --- a/crates/rome_js_formatter/src/jsx/tag/fragment.rs +++ b/crates/rome_js_formatter/src/jsx/tag/fragment.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxFragment, JsxFragmentFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxFragment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxFragmentFields { opening_fragment, diff --git a/crates/rome_js_formatter/src/jsx/tag/opening_element.rs b/crates/rome_js_formatter/src/jsx/tag/opening_element.rs index 6fbee338569..b28c4556540 100644 --- a/crates/rome_js_formatter/src/jsx/tag/opening_element.rs +++ b/crates/rome_js_formatter/src/jsx/tag/opening_element.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxOpeningElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } diff --git a/crates/rome_js_formatter/src/jsx/tag/opening_fragment.rs b/crates/rome_js_formatter/src/jsx/tag/opening_fragment.rs index c968a39d552..53b3384aa35 100644 --- a/crates/rome_js_formatter/src/jsx/tag/opening_fragment.rs +++ b/crates/rome_js_formatter/src/jsx/tag/opening_fragment.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxOpeningFragment, JsxOpeningFragmentFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxOpeningFragment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxOpeningFragmentFields { r_angle_token, diff --git a/crates/rome_js_formatter/src/jsx/tag/self_closing_element.rs b/crates/rome_js_formatter/src/jsx/tag/self_closing_element.rs index 0679a7ea0ab..81cf602142a 100644 --- a/crates/rome_js_formatter/src/jsx/tag/self_closing_element.rs +++ b/crates/rome_js_formatter/src/jsx/tag/self_closing_element.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{JsxSelfClosingElement, JsxSelfClosingElementFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &JsxSelfClosingElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let JsxSelfClosingElementFields { l_angle_token, diff --git a/crates/rome_js_formatter/src/lib.rs b/crates/rome_js_formatter/src/lib.rs index b3978b369c0..a08c6f6ac7a 100644 --- a/crates/rome_js_formatter/src/lib.rs +++ b/crates/rome_js_formatter/src/lib.rs @@ -20,8 +20,8 @@ use rome_rowan::AstNode; use rome_rowan::SyntaxResult; use rome_rowan::TextRange; +use crate::context::JsFormatContext; use crate::cst::FormatJsSyntaxNode; -use crate::options::JsFormatOptions; use std::iter::FusedIterator; use std::marker::PhantomData; @@ -29,7 +29,7 @@ use std::marker::PhantomData; /// Used to get an object that knows how to format this object. pub trait AsFormat<'a> { - type Format: Format; + type Format: Format; /// Returns an object that is able to format this object. fn format(&'a self) -> Self::Format; @@ -171,9 +171,9 @@ where N: AstNode, FormatNodeRule: FormatNodeFields, { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(node: &N, formatter: &Formatter) -> FormatResult { + fn format(node: &N, formatter: &Formatter) -> FormatResult { let syntax = node.syntax(); let element = if has_formatter_suppressions(syntax) { suppressed_node(syntax).format(formatter)? @@ -192,7 +192,7 @@ where /// Formats the node's fields. fn format_fields( item: &T, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult; } @@ -200,11 +200,11 @@ where pub struct FormatJsSyntaxToken; impl FormatRule for FormatJsSyntaxToken { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( token: &JsSyntaxToken, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatter.track_token(token); @@ -244,12 +244,12 @@ impl IntoFormat for JsSyntaxToken { /// It returns a [Formatted] result with a range corresponding to the /// range of the input that was effectively overwritten by the formatter pub fn format_range( - options: JsFormatOptions, + context: JsFormatContext, root: &JsSyntaxNode, range: TextRange, ) -> FormatResult { rome_formatter::format_range::<_, _, FormatJsSyntaxNode, _>( - options, + context, root, range, is_range_formatting_root, @@ -275,8 +275,8 @@ fn is_range_formatting_root(node: &JsSyntaxNode) -> bool { /// Formats a JavaScript (and its super languages) file based on its features. /// /// It returns a [Formatted] result, which the user can use to override a file. -pub fn format_node(options: JsFormatOptions, root: &JsSyntaxNode) -> FormatResult { - rome_formatter::format_node(options, &root.format()) +pub fn format_node(context: JsFormatContext, root: &JsSyntaxNode) -> FormatResult { + rome_formatter::format_node(context, &root.format()) } /// Formats a single node within a file, supported by Rome. @@ -289,8 +289,8 @@ pub fn format_node(options: JsFormatOptions, root: &JsSyntaxNode) -> FormatResul /// even if it's a mismatch from the rest of the block the selection is in /// /// It returns a [Formatted] result -pub fn format_sub_tree(options: JsFormatOptions, root: &JsSyntaxNode) -> FormatResult { - rome_formatter::format_sub_tree(options, &root.format()) +pub fn format_sub_tree(context: JsFormatContext, root: &JsSyntaxNode) -> FormatResult { + rome_formatter::format_sub_tree(context, &root.format()) } #[cfg(test)] @@ -298,7 +298,7 @@ mod tests { use super::format_range; - use crate::options::JsFormatOptions; + use crate::context::JsFormatContext; use rome_formatter::IndentStyle; use rome_js_parser::parse_script; use rome_rowan::{TextRange, TextSize}; @@ -335,9 +335,9 @@ while( let tree = parse_script(input, 0); let result = format_range( - JsFormatOptions { + JsFormatContext { indent_style: IndentStyle::Space(4), - ..JsFormatOptions::default() + ..JsFormatContext::default() }, &tree.syntax(), TextRange::new(range_start, range_end), @@ -370,9 +370,9 @@ function() { let tree = parse_script(input, 0); let result = format_range( - JsFormatOptions { + JsFormatContext { indent_style: IndentStyle::Space(4), - ..JsFormatOptions::default() + ..JsFormatContext::default() }, &tree.syntax(), TextRange::new(range_start, range_end), @@ -404,9 +404,9 @@ function() { let tree = parse_script(input, 0); let result = format_range( - JsFormatOptions { + JsFormatContext { indent_style: IndentStyle::Space(4), - ..JsFormatOptions::default() + ..JsFormatContext::default() }, &tree.syntax(), TextRange::new(range_start, range_end), @@ -426,9 +426,9 @@ function() { let tree = parse_script(input, 0); let result = format_range( - JsFormatOptions { + JsFormatContext { indent_style: IndentStyle::Space(4), - ..JsFormatOptions::default() + ..JsFormatContext::default() }, &tree.syntax(), TextRange::new(range_start, range_end), @@ -451,9 +451,9 @@ function() { let tree = parse_script(input, 0); let result = format_range( - JsFormatOptions { + JsFormatContext { indent_style: IndentStyle::Space(4), - ..JsFormatOptions::default() + ..JsFormatContext::default() }, &tree.syntax(), TextRange::new(range_start, range_end), @@ -469,12 +469,12 @@ function() { mod check_reformat; #[rustfmt::skip] mod generated; -pub mod options; +pub mod context; #[cfg(test)] mod test { use crate::check_reformat::{check_reformat, CheckReformatParams}; - use crate::{format_node, JsFormatOptions}; + use crate::{format_node, JsFormatContext}; use rome_js_parser::parse; use rome_js_syntax::SourceType; @@ -488,8 +488,8 @@ mod test { "#; let syntax = SourceType::jsx(); - let tree = parse(src, 0, syntax.clone()); - let result = format_node(JsFormatOptions::default(), &tree.syntax()) + let tree = parse(src, 0, syntax); + let result = format_node(JsFormatContext::default(), &tree.syntax()) .unwrap() .print(); check_reformat(CheckReformatParams { @@ -497,7 +497,7 @@ mod test { text: result.as_code(), source_type: syntax, file_name: "quick_test", - format_options: JsFormatOptions::default(), + format_context: JsFormatContext::default(), }); assert_eq!( result.as_code(), diff --git a/crates/rome_js_formatter/src/prelude.rs b/crates/rome_js_formatter/src/prelude.rs index d59b6d1f920..942129a0b97 100644 --- a/crates/rome_js_formatter/src/prelude.rs +++ b/crates/rome_js_formatter/src/prelude.rs @@ -2,7 +2,7 @@ //! when implementing the [crate::FormatNode] trait. pub(crate) use crate::{ - AsFormat as _, FormatNodeRule, FormattedIterExt, JsFormatOptions, JsFormatter as _, + AsFormat as _, FormatNodeRule, FormattedIterExt, JsFormatContext, JsFormatter as _, }; pub use rome_formatter::prelude::*; pub use rome_rowan::{AstNode as _, AstNodeList as _, AstSeparatedList as _}; diff --git a/crates/rome_js_formatter/src/ts/any/external_module_declaration_body.rs b/crates/rome_js_formatter/src/ts/any/external_module_declaration_body.rs index 17629df28e2..6aa7c766077 100644 --- a/crates/rome_js_formatter/src/ts/any/external_module_declaration_body.rs +++ b/crates/rome_js_formatter/src/ts/any/external_module_declaration_body.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyExternalModuleDeclarationBody; use crate::prelude::*; use rome_js_syntax::TsAnyExternalModuleDeclarationBody; impl FormatRule for FormatTsAnyExternalModuleDeclarationBody { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyExternalModuleDeclarationBody, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyExternalModuleDeclarationBody::TsEmptyExternalModuleDeclarationBody(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/index_signature_modifier.rs b/crates/rome_js_formatter/src/ts/any/index_signature_modifier.rs index cec6ba7f9f9..be3abce10fd 100644 --- a/crates/rome_js_formatter/src/ts/any/index_signature_modifier.rs +++ b/crates/rome_js_formatter/src/ts/any/index_signature_modifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyIndexSignatureModifier; use crate::prelude::*; use rome_js_syntax::TsAnyIndexSignatureModifier; impl FormatRule for FormatTsAnyIndexSignatureModifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyIndexSignatureModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyIndexSignatureModifier::JsStaticModifier(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/method_signature_modifier.rs b/crates/rome_js_formatter/src/ts/any/method_signature_modifier.rs index 597dbe09d30..6b00256e307 100644 --- a/crates/rome_js_formatter/src/ts/any/method_signature_modifier.rs +++ b/crates/rome_js_formatter/src/ts/any/method_signature_modifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyMethodSignatureModifier; use crate::prelude::*; use rome_js_syntax::TsAnyMethodSignatureModifier; impl FormatRule for FormatTsAnyMethodSignatureModifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyMethodSignatureModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyMethodSignatureModifier::TsAccessibilityModifier(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/module_name.rs b/crates/rome_js_formatter/src/ts/any/module_name.rs index 0fe94c3c88b..a3490a2cf60 100644 --- a/crates/rome_js_formatter/src/ts/any/module_name.rs +++ b/crates/rome_js_formatter/src/ts/any/module_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyModuleName; use crate::prelude::*; use rome_js_syntax::TsAnyModuleName; impl FormatRule for FormatTsAnyModuleName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyModuleName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyModuleName::TsIdentifierBinding(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/ts/any/module_reference.rs b/crates/rome_js_formatter/src/ts/any/module_reference.rs index c29c4ef91a2..087dcc93b54 100644 --- a/crates/rome_js_formatter/src/ts/any/module_reference.rs +++ b/crates/rome_js_formatter/src/ts/any/module_reference.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyModuleReference; use crate::prelude::*; use rome_js_syntax::TsAnyModuleReference; impl FormatRule for FormatTsAnyModuleReference { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyModuleReference, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyModuleReference::TsAnyName(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/ts/any/name.rs b/crates/rome_js_formatter/src/ts/any/name.rs index d60bad9e88e..7840c9338ed 100644 --- a/crates/rome_js_formatter/src/ts/any/name.rs +++ b/crates/rome_js_formatter/src/ts/any/name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyName; use crate::prelude::*; use rome_js_syntax::TsAnyName; impl FormatRule for FormatTsAnyName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyName::JsReferenceIdentifier(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/ts/any/property_annotation.rs b/crates/rome_js_formatter/src/ts/any/property_annotation.rs index 519222b2df6..edbfbb2a641 100644 --- a/crates/rome_js_formatter/src/ts/any/property_annotation.rs +++ b/crates/rome_js_formatter/src/ts/any/property_annotation.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyPropertyAnnotation; use crate::prelude::*; use rome_js_syntax::TsAnyPropertyAnnotation; impl FormatRule for FormatTsAnyPropertyAnnotation { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyPropertyAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyPropertyAnnotation::TsTypeAnnotation(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/property_parameter_modifier.rs b/crates/rome_js_formatter/src/ts/any/property_parameter_modifier.rs index b2da6fdf125..aad29b072a3 100644 --- a/crates/rome_js_formatter/src/ts/any/property_parameter_modifier.rs +++ b/crates/rome_js_formatter/src/ts/any/property_parameter_modifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyPropertyParameterModifier; use crate::prelude::*; use rome_js_syntax::TsAnyPropertyParameterModifier; impl FormatRule for FormatTsAnyPropertyParameterModifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyPropertyParameterModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyPropertyParameterModifier::TsAccessibilityModifier(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/property_signature_annotation.rs b/crates/rome_js_formatter/src/ts/any/property_signature_annotation.rs index c00e50c01cd..3834381c9f8 100644 --- a/crates/rome_js_formatter/src/ts/any/property_signature_annotation.rs +++ b/crates/rome_js_formatter/src/ts/any/property_signature_annotation.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyPropertySignatureAnnotation; use crate::prelude::*; use rome_js_syntax::TsAnyPropertySignatureAnnotation; impl FormatRule for FormatTsAnyPropertySignatureAnnotation { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyPropertySignatureAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyPropertySignatureAnnotation::TsTypeAnnotation(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/property_signature_modifier.rs b/crates/rome_js_formatter/src/ts/any/property_signature_modifier.rs index a9ae4ffce1f..1c28b0db09f 100644 --- a/crates/rome_js_formatter/src/ts/any/property_signature_modifier.rs +++ b/crates/rome_js_formatter/src/ts/any/property_signature_modifier.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyPropertySignatureModifier; use crate::prelude::*; use rome_js_syntax::TsAnyPropertySignatureModifier; impl FormatRule for FormatTsAnyPropertySignatureModifier { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyPropertySignatureModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyPropertySignatureModifier::TsDeclareModifier(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/return_type.rs b/crates/rome_js_formatter/src/ts/any/return_type.rs index d78f4c5f2cc..47525298e7e 100644 --- a/crates/rome_js_formatter/src/ts/any/return_type.rs +++ b/crates/rome_js_formatter/src/ts/any/return_type.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyReturnType; use crate::prelude::*; use rome_js_syntax::TsAnyReturnType; impl FormatRule for FormatTsAnyReturnType { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyReturnType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyReturnType::TsType(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/ts/any/template_element.rs b/crates/rome_js_formatter/src/ts/any/template_element.rs index aadc495e1f6..f1f10f84e18 100644 --- a/crates/rome_js_formatter/src/ts/any/template_element.rs +++ b/crates/rome_js_formatter/src/ts/any/template_element.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyTemplateElement; use crate::prelude::*; use rome_js_syntax::TsAnyTemplateElement; impl FormatRule for FormatTsAnyTemplateElement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyTemplateElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyTemplateElement::TsTemplateChunkElement(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/ts_type.rs b/crates/rome_js_formatter/src/ts/any/ts_type.rs index 8ee8e010d1f..369256caa87 100644 --- a/crates/rome_js_formatter/src/ts/any/ts_type.rs +++ b/crates/rome_js_formatter/src/ts/any/ts_type.rs @@ -4,8 +4,8 @@ use crate::generated::FormatTsType; use crate::prelude::*; use rome_js_syntax::TsType; impl FormatRule for FormatTsType { - type Options = JsFormatOptions; - fn format(node: &TsType, formatter: &Formatter) -> FormatResult { + type Context = JsFormatContext; + fn format(node: &TsType, formatter: &Formatter) -> FormatResult { match node { TsType::TsAnyType(node) => formatted![formatter, [node.format()]], TsType::TsUnknownType(node) => formatted![formatter, [node.format()]], diff --git a/crates/rome_js_formatter/src/ts/any/tuple_type_element.rs b/crates/rome_js_formatter/src/ts/any/tuple_type_element.rs index 0d4da8792c4..e1e7bdd1f63 100644 --- a/crates/rome_js_formatter/src/ts/any/tuple_type_element.rs +++ b/crates/rome_js_formatter/src/ts/any/tuple_type_element.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyTupleTypeElement; use crate::prelude::*; use rome_js_syntax::TsAnyTupleTypeElement; impl FormatRule for FormatTsAnyTupleTypeElement { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyTupleTypeElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyTupleTypeElement::TsNamedTupleTypeElement(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/type_member.rs b/crates/rome_js_formatter/src/ts/any/type_member.rs index 1b9b88310a6..9c702e1a9da 100644 --- a/crates/rome_js_formatter/src/ts/any/type_member.rs +++ b/crates/rome_js_formatter/src/ts/any/type_member.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyTypeMember; use crate::prelude::*; use rome_js_syntax::TsAnyTypeMember; impl FormatRule for FormatTsAnyTypeMember { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyTypeMember::TsCallSignatureTypeMember(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/type_predicate_parameter_name.rs b/crates/rome_js_formatter/src/ts/any/type_predicate_parameter_name.rs index 354348bc304..60b2ffcff56 100644 --- a/crates/rome_js_formatter/src/ts/any/type_predicate_parameter_name.rs +++ b/crates/rome_js_formatter/src/ts/any/type_predicate_parameter_name.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyTypePredicateParameterName; use crate::prelude::*; use rome_js_syntax::TsAnyTypePredicateParameterName; impl FormatRule for FormatTsAnyTypePredicateParameterName { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyTypePredicateParameterName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyTypePredicateParameterName::JsReferenceIdentifier(node) => { diff --git a/crates/rome_js_formatter/src/ts/any/variable_annotation.rs b/crates/rome_js_formatter/src/ts/any/variable_annotation.rs index 672c269af55..2e0e61faecf 100644 --- a/crates/rome_js_formatter/src/ts/any/variable_annotation.rs +++ b/crates/rome_js_formatter/src/ts/any/variable_annotation.rs @@ -4,10 +4,10 @@ use crate::generated::FormatTsAnyVariableAnnotation; use crate::prelude::*; use rome_js_syntax::TsAnyVariableAnnotation; impl FormatRule for FormatTsAnyVariableAnnotation { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsAnyVariableAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { match node { TsAnyVariableAnnotation::TsTypeAnnotation(node) => { diff --git a/crates/rome_js_formatter/src/ts/assignments/as_assignment.rs b/crates/rome_js_formatter/src/ts/assignments/as_assignment.rs index 04fca0c2c9e..7df68516c42 100644 --- a/crates/rome_js_formatter/src/ts/assignments/as_assignment.rs +++ b/crates/rome_js_formatter/src/ts/assignments/as_assignment.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsAsAssignmentFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAsAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAsAssignmentFields { assignment, diff --git a/crates/rome_js_formatter/src/ts/assignments/non_null_assertion_assignment.rs b/crates/rome_js_formatter/src/ts/assignments/non_null_assertion_assignment.rs index 4f3ad3a5089..5815e49b9c2 100644 --- a/crates/rome_js_formatter/src/ts/assignments/non_null_assertion_assignment.rs +++ b/crates/rome_js_formatter/src/ts/assignments/non_null_assertion_assignment.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsNonNullAssertionAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNonNullAssertionAssignmentFields { assignment, diff --git a/crates/rome_js_formatter/src/ts/assignments/type_assertion_assignment.rs b/crates/rome_js_formatter/src/ts/assignments/type_assertion_assignment.rs index 95024c819bf..c549b4864dc 100644 --- a/crates/rome_js_formatter/src/ts/assignments/type_assertion_assignment.rs +++ b/crates/rome_js_formatter/src/ts/assignments/type_assertion_assignment.rs @@ -7,7 +7,7 @@ use rome_js_syntax::TsTypeAssertionAssignment; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeAssertionAssignment, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeAssertionAssignmentFields { l_angle_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/abstract_modifier.rs b/crates/rome_js_formatter/src/ts/auxiliary/abstract_modifier.rs index aefb04218ca..af59d1aaa68 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/abstract_modifier.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/abstract_modifier.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsAbstractModifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAbstractModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAbstractModifierFields { modifier_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/auxiliary/accessibility_modifier.rs b/crates/rome_js_formatter/src/ts/auxiliary/accessibility_modifier.rs index cf2f5dc57ba..7ae8810f1fe 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/accessibility_modifier.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/accessibility_modifier.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsAccessibilityModifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAccessibilityModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAccessibilityModifierFields { modifier_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/auxiliary/asserts_condition.rs b/crates/rome_js_formatter/src/ts/auxiliary/asserts_condition.rs index 324e2c94aa2..5d6073573a1 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/asserts_condition.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/asserts_condition.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsAssertsConditionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAssertsCondition, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAssertsConditionFields { is_token, ty } = node.as_fields(); formatted![formatter, [is_token.format(), space_token(), ty.format()]] diff --git a/crates/rome_js_formatter/src/ts/auxiliary/call_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/call_signature_type_member.rs index c64fc282ea2..d47bb6653ec 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/call_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/call_signature_type_member.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsCallSignatureTypeMember, TsCallSignatureTypeMemberFields} impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsCallSignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsCallSignatureTypeMemberFields { type_parameters, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/construct_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/construct_signature_type_member.rs index ab89d26c619..13ff562d8bf 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/construct_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/construct_signature_type_member.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsConstructSignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsConstructSignatureTypeMemberFields { new_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/declare_modifier.rs b/crates/rome_js_formatter/src/ts/auxiliary/declare_modifier.rs index c59b0131ac6..9b5d1dfa823 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/declare_modifier.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/declare_modifier.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsDeclareModifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsDeclareModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsDeclareModifierFields { modifier_token } = node.as_fields(); formatted![formatter, [modifier_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/auxiliary/default_type_clause.rs b/crates/rome_js_formatter/src/ts/auxiliary/default_type_clause.rs index 88c68595e8c..f8f78132e4a 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/default_type_clause.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/default_type_clause.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsDefaultTypeClause, TsDefaultTypeClauseFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsDefaultTypeClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsDefaultTypeClauseFields { eq_token, ty } = node.as_fields(); formatted![formatter, [eq_token.format(), space_token(), ty.format()]] diff --git a/crates/rome_js_formatter/src/ts/auxiliary/definite_property_annotation.rs b/crates/rome_js_formatter/src/ts/auxiliary/definite_property_annotation.rs index e17a74c08aa..4305d8f2b6c 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/definite_property_annotation.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/definite_property_annotation.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsDefinitePropertyAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsDefinitePropertyAnnotationFields { excl_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/definite_variable_annotation.rs b/crates/rome_js_formatter/src/ts/auxiliary/definite_variable_annotation.rs index ec49f267047..147f1fe0b9d 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/definite_variable_annotation.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/definite_variable_annotation.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsDefiniteVariableAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsDefiniteVariableAnnotationFields { excl_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/empty_external_module_declaration_body.rs b/crates/rome_js_formatter/src/ts/auxiliary/empty_external_module_declaration_body.rs index ead0cf9609d..a1cbe31ac8f 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/empty_external_module_declaration_body.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/empty_external_module_declaration_body.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsEmptyExternalModuleDeclarationBody, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsEmptyExternalModuleDeclarationBodyFields { semicolon_token } = node.as_fields(); formatted![formatter, [semicolon_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/auxiliary/enum_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/enum_member.rs index d0bb157585f..3f539bdac04 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/enum_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/enum_member.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsEnumMember, TsEnumMemberFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsEnumMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsEnumMemberFields { name, initializer } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/auxiliary/external_module_reference.rs b/crates/rome_js_formatter/src/ts/auxiliary/external_module_reference.rs index c1ff6f35562..bd76432744d 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/external_module_reference.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/external_module_reference.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsExternalModuleReferenceFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsExternalModuleReference, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsExternalModuleReferenceFields { require_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/getter_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/getter_signature_type_member.rs index b61e63cfd75..d0b84da392d 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/getter_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/getter_signature_type_member.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsGetterSignatureTypeMember, TsGetterSignatureTypeMemberFie impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsGetterSignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsGetterSignatureTypeMemberFields { get_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/implements_clause.rs b/crates/rome_js_formatter/src/ts/auxiliary/implements_clause.rs index cb69b0a4240..c212c3f2923 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/implements_clause.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/implements_clause.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsImplementsClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsImplementsClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsImplementsClauseFields { implements_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/index_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/index_signature_type_member.rs index 49aa53b31a2..b42b7f55976 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/index_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/index_signature_type_member.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsIndexSignatureTypeMember, TsIndexSignatureTypeMemberField impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsIndexSignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsIndexSignatureTypeMemberFields { readonly_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_as_clause.rs b/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_as_clause.rs index e8ad9da58e4..835adb56395 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_as_clause.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_as_clause.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsMappedTypeAsClause, TsMappedTypeAsClauseFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsMappedTypeAsClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsMappedTypeAsClauseFields { as_token, ty } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_optional_modifier_clause.rs b/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_optional_modifier_clause.rs index faf0a9e1a97..b064ee4ea46 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_optional_modifier_clause.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_optional_modifier_clause.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsMappedTypeOptionalModifierClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsMappedTypeOptionalModifierClauseFields { operator_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_readonly_modifier_clause.rs b/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_readonly_modifier_clause.rs index 221d726da0d..b860f6f297c 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_readonly_modifier_clause.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/mapped_type_readonly_modifier_clause.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsMappedTypeReadonlyModifierClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsMappedTypeReadonlyModifierClauseFields { operator_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/method_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/method_signature_type_member.rs index f66a21a94c4..e82836f94a5 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/method_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/method_signature_type_member.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsMethodSignatureTypeMember, TsMethodSignatureTypeMemberFie impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsMethodSignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsMethodSignatureTypeMemberFields { name, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/module_block.rs b/crates/rome_js_formatter/src/ts/auxiliary/module_block.rs index b62f44ee9dd..d13296540b4 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/module_block.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/module_block.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsModuleBlockFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsModuleBlock, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsModuleBlockFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/named_tuple_type_element.rs b/crates/rome_js_formatter/src/ts/auxiliary/named_tuple_type_element.rs index abfa635fdbf..fb2d0760a5f 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/named_tuple_type_element.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/named_tuple_type_element.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNamedTupleTypeElement, TsNamedTupleTypeElementFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNamedTupleTypeElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNamedTupleTypeElementFields { ty, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/optional_property_annotation.rs b/crates/rome_js_formatter/src/ts/auxiliary/optional_property_annotation.rs index 34daf4e7b3e..9e105a45c6a 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/optional_property_annotation.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/optional_property_annotation.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsOptionalPropertyAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsOptionalPropertyAnnotationFields { question_mark_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/optional_tuple_type_element.rs b/crates/rome_js_formatter/src/ts/auxiliary/optional_tuple_type_element.rs index 78025fa5f8e..7b684b1a5e1 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/optional_tuple_type_element.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/optional_tuple_type_element.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsOptionalTupleTypeElement, TsOptionalTupleTypeElementField impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsOptionalTupleTypeElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsOptionalTupleTypeElementFields { ty, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/override_modifier.rs b/crates/rome_js_formatter/src/ts/auxiliary/override_modifier.rs index 351442602b4..da802cd446a 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/override_modifier.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/override_modifier.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsOverrideModifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsOverrideModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsOverrideModifierFields { modifier_token } = node.as_fields(); formatted![formatter, [modifier_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/auxiliary/property_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/property_signature_type_member.rs index 2b6f93d9a99..077fa51076d 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/property_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/property_signature_type_member.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsPropertySignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsPropertySignatureTypeMemberFields { readonly_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/qualified_module_name.rs b/crates/rome_js_formatter/src/ts/auxiliary/qualified_module_name.rs index e264d27caaa..7c7b032c23d 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/qualified_module_name.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/qualified_module_name.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsQualifiedModuleNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsQualifiedModuleName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsQualifiedModuleNameFields { left, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/qualified_name.rs b/crates/rome_js_formatter/src/ts/auxiliary/qualified_name.rs index 024087440ee..e582983976b 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/qualified_name.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/qualified_name.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsQualifiedNameFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsQualifiedName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsQualifiedNameFields { left, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/readonly_modifier.rs b/crates/rome_js_formatter/src/ts/auxiliary/readonly_modifier.rs index 6f5c5f12c1c..8d75a6a1f05 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/readonly_modifier.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/readonly_modifier.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsReadonlyModifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsReadonlyModifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsReadonlyModifierFields { modifier_token } = node.as_fields(); formatted![formatter, [modifier_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/auxiliary/rest_tuple_type_element.rs b/crates/rome_js_formatter/src/ts/auxiliary/rest_tuple_type_element.rs index 25a842c9f78..20ceea43839 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/rest_tuple_type_element.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/rest_tuple_type_element.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsRestTupleTypeElement, TsRestTupleTypeElementFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsRestTupleTypeElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsRestTupleTypeElementFields { dotdotdot_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/return_type_annotation.rs b/crates/rome_js_formatter/src/ts/auxiliary/return_type_annotation.rs index 0cab732e0fe..844822768a7 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/return_type_annotation.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/return_type_annotation.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsReturnTypeAnnotationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsReturnTypeAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsReturnTypeAnnotationFields { colon_token, ty } = node.as_fields(); formatted![ diff --git a/crates/rome_js_formatter/src/ts/auxiliary/setter_signature_type_member.rs b/crates/rome_js_formatter/src/ts/auxiliary/setter_signature_type_member.rs index 5637f25b05c..4c6960bef01 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/setter_signature_type_member.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/setter_signature_type_member.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsSetterSignatureTypeMember, TsSetterSignatureTypeMemberFie impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsSetterSignatureTypeMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsSetterSignatureTypeMemberFields { set_token, diff --git a/crates/rome_js_formatter/src/ts/auxiliary/type_annotation.rs b/crates/rome_js_formatter/src/ts/auxiliary/type_annotation.rs index 14a6650bd15..b34e4c7a159 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/type_annotation.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/type_annotation.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeAnnotation, TsTypeAnnotationFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeAnnotation, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeAnnotationFields { colon_token, ty } = node.as_fields(); let colon = colon_token.format(); diff --git a/crates/rome_js_formatter/src/ts/auxiliary/type_constraint_clause.rs b/crates/rome_js_formatter/src/ts/auxiliary/type_constraint_clause.rs index 7f976e30c43..cc139af916e 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/type_constraint_clause.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/type_constraint_clause.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeConstraintClause, TsTypeConstraintClauseFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeConstraintClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeConstraintClauseFields { extends_token, ty } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/auxiliary/type_parameter_name.rs b/crates/rome_js_formatter/src/ts/auxiliary/type_parameter_name.rs index 6a53a04326a..7c661ff59b7 100644 --- a/crates/rome_js_formatter/src/ts/auxiliary/type_parameter_name.rs +++ b/crates/rome_js_formatter/src/ts/auxiliary/type_parameter_name.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeParameterName, TsTypeParameterNameFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeParameterName, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeParameterNameFields { ident_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/bindings/identifier_binding.rs b/crates/rome_js_formatter/src/ts/bindings/identifier_binding.rs index e36e5d28cec..f82e3512629 100644 --- a/crates/rome_js_formatter/src/ts/bindings/identifier_binding.rs +++ b/crates/rome_js_formatter/src/ts/bindings/identifier_binding.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsIdentifierBinding, TsIdentifierBindingFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsIdentifierBinding, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsIdentifierBindingFields { name_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/bindings/index_signature_parameter.rs b/crates/rome_js_formatter/src/ts/bindings/index_signature_parameter.rs index 6d2fde21b3f..a0a828d116e 100644 --- a/crates/rome_js_formatter/src/ts/bindings/index_signature_parameter.rs +++ b/crates/rome_js_formatter/src/ts/bindings/index_signature_parameter.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsIndexSignatureParameter, TsIndexSignatureParameterFields} impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsIndexSignatureParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsIndexSignatureParameterFields { binding, diff --git a/crates/rome_js_formatter/src/ts/bindings/property_parameter.rs b/crates/rome_js_formatter/src/ts/bindings/property_parameter.rs index a8bae04e281..2d414f4c150 100644 --- a/crates/rome_js_formatter/src/ts/bindings/property_parameter.rs +++ b/crates/rome_js_formatter/src/ts/bindings/property_parameter.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsPropertyParameter, TsPropertyParameterFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsPropertyParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsPropertyParameterFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/bindings/this_parameter.rs b/crates/rome_js_formatter/src/ts/bindings/this_parameter.rs index 002febe6fa6..e22c0c637d4 100644 --- a/crates/rome_js_formatter/src/ts/bindings/this_parameter.rs +++ b/crates/rome_js_formatter/src/ts/bindings/this_parameter.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsThisParameter, TsThisParameterFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsThisParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsThisParameterFields { this_token, diff --git a/crates/rome_js_formatter/src/ts/bindings/type_parameter.rs b/crates/rome_js_formatter/src/ts/bindings/type_parameter.rs index 69c5030abe3..5f52073a397 100644 --- a/crates/rome_js_formatter/src/ts/bindings/type_parameter.rs +++ b/crates/rome_js_formatter/src/ts/bindings/type_parameter.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeParameter, TsTypeParameterFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeParameter, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeParameterFields { name, diff --git a/crates/rome_js_formatter/src/ts/bindings/type_parameters.rs b/crates/rome_js_formatter/src/ts/bindings/type_parameters.rs index 5b222ea1fce..1ab9d9642eb 100644 --- a/crates/rome_js_formatter/src/ts/bindings/type_parameters.rs +++ b/crates/rome_js_formatter/src/ts/bindings/type_parameters.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeParameters, TsTypeParametersFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeParameters, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeParametersFields { items, diff --git a/crates/rome_js_formatter/src/ts/classes/constructor_signature_class_member.rs b/crates/rome_js_formatter/src/ts/classes/constructor_signature_class_member.rs index 1312559024a..009547832a1 100644 --- a/crates/rome_js_formatter/src/ts/classes/constructor_signature_class_member.rs +++ b/crates/rome_js_formatter/src/ts/classes/constructor_signature_class_member.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &TsConstructorSignatureClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsConstructorSignatureClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/classes/extends_clause.rs b/crates/rome_js_formatter/src/ts/classes/extends_clause.rs index 9729240d093..a46e9d88d74 100644 --- a/crates/rome_js_formatter/src/ts/classes/extends_clause.rs +++ b/crates/rome_js_formatter/src/ts/classes/extends_clause.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsExtendsClause, TsExtendsClauseFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsExtendsClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsExtendsClauseFields { extends_token, diff --git a/crates/rome_js_formatter/src/ts/classes/getter_signature_class_member.rs b/crates/rome_js_formatter/src/ts/classes/getter_signature_class_member.rs index 12ecfe45327..82b56d9fa01 100644 --- a/crates/rome_js_formatter/src/ts/classes/getter_signature_class_member.rs +++ b/crates/rome_js_formatter/src/ts/classes/getter_signature_class_member.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsGetterSignatureClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsGetterSignatureClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/classes/index_signature_class_member.rs b/crates/rome_js_formatter/src/ts/classes/index_signature_class_member.rs index 9de0365cf10..f77dfac6479 100644 --- a/crates/rome_js_formatter/src/ts/classes/index_signature_class_member.rs +++ b/crates/rome_js_formatter/src/ts/classes/index_signature_class_member.rs @@ -7,7 +7,7 @@ use rome_js_syntax::TsIndexSignatureClassMemberFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsIndexSignatureClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsIndexSignatureClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/classes/method_signature_class_member.rs b/crates/rome_js_formatter/src/ts/classes/method_signature_class_member.rs index dfe242c4dd0..6f75875015b 100644 --- a/crates/rome_js_formatter/src/ts/classes/method_signature_class_member.rs +++ b/crates/rome_js_formatter/src/ts/classes/method_signature_class_member.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsMethodSignatureClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsMethodSignatureClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/classes/property_signature_class_member.rs b/crates/rome_js_formatter/src/ts/classes/property_signature_class_member.rs index 41ed566495d..b14bf26e788 100644 --- a/crates/rome_js_formatter/src/ts/classes/property_signature_class_member.rs +++ b/crates/rome_js_formatter/src/ts/classes/property_signature_class_member.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsPropertySignatureClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsPropertySignatureClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/classes/setter_signature_class_member.rs b/crates/rome_js_formatter/src/ts/classes/setter_signature_class_member.rs index c03fdb02f2e..efae4bb1720 100644 --- a/crates/rome_js_formatter/src/ts/classes/setter_signature_class_member.rs +++ b/crates/rome_js_formatter/src/ts/classes/setter_signature_class_member.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsSetterSignatureClassMember, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsSetterSignatureClassMemberFields { modifiers, diff --git a/crates/rome_js_formatter/src/ts/declarations/declare_function_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/declare_function_declaration.rs index b08086b96c3..9356b2ca367 100644 --- a/crates/rome_js_formatter/src/ts/declarations/declare_function_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/declare_function_declaration.rs @@ -9,7 +9,7 @@ impl FormatNodeFields { fn format_fields( node: &TsDeclareFunctionDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsDeclareFunctionDeclarationFields { async_token, diff --git a/crates/rome_js_formatter/src/ts/declarations/enum_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/enum_declaration.rs index f1e69a6da20..df3356dfb7a 100644 --- a/crates/rome_js_formatter/src/ts/declarations/enum_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/enum_declaration.rs @@ -7,7 +7,7 @@ use rome_rowan::AstNode; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsEnumDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsEnumDeclarationFields { const_token, diff --git a/crates/rome_js_formatter/src/ts/declarations/external_module_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/external_module_declaration.rs index 0751eca3ebd..b6ce4a6120e 100644 --- a/crates/rome_js_formatter/src/ts/declarations/external_module_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/external_module_declaration.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsExternalModuleDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsExternalModuleDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsExternalModuleDeclarationFields { body, diff --git a/crates/rome_js_formatter/src/ts/declarations/global_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/global_declaration.rs index aa36d140992..cc39d555ef5 100644 --- a/crates/rome_js_formatter/src/ts/declarations/global_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/global_declaration.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsGlobalDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsGlobalDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsGlobalDeclarationFields { global_token, body } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/declarations/import_equals_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/import_equals_declaration.rs index 9281fbfc63c..c558f4b69bf 100644 --- a/crates/rome_js_formatter/src/ts/declarations/import_equals_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/import_equals_declaration.rs @@ -7,7 +7,7 @@ use rome_js_syntax::TsImportEqualsDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsImportEqualsDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsImportEqualsDeclarationFields { import_token, diff --git a/crates/rome_js_formatter/src/ts/declarations/interface_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/interface_declaration.rs index 259388acc6b..77005411311 100644 --- a/crates/rome_js_formatter/src/ts/declarations/interface_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/interface_declaration.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsInterfaceDeclaration, TsInterfaceDeclarationFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsInterfaceDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsInterfaceDeclarationFields { interface_token, diff --git a/crates/rome_js_formatter/src/ts/declarations/module_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/module_declaration.rs index 1909bcf2106..7bb3f3e0e99 100644 --- a/crates/rome_js_formatter/src/ts/declarations/module_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/module_declaration.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsModuleDeclarationFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsModuleDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsModuleDeclarationFields { module_or_namespace, diff --git a/crates/rome_js_formatter/src/ts/declarations/type_alias_declaration.rs b/crates/rome_js_formatter/src/ts/declarations/type_alias_declaration.rs index 8488f3217de..4b9c998958d 100644 --- a/crates/rome_js_formatter/src/ts/declarations/type_alias_declaration.rs +++ b/crates/rome_js_formatter/src/ts/declarations/type_alias_declaration.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsTypeAliasDeclaration, TsTypeAliasDeclarationFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeAliasDeclaration, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeAliasDeclarationFields { type_token, diff --git a/crates/rome_js_formatter/src/ts/expressions/as_expression.rs b/crates/rome_js_formatter/src/ts/expressions/as_expression.rs index 129be327478..d9dd9d9aa18 100644 --- a/crates/rome_js_formatter/src/ts/expressions/as_expression.rs +++ b/crates/rome_js_formatter/src/ts/expressions/as_expression.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsAsExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAsExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAsExpressionFields { ty, diff --git a/crates/rome_js_formatter/src/ts/expressions/name_with_type_arguments.rs b/crates/rome_js_formatter/src/ts/expressions/name_with_type_arguments.rs index 11c65d3d286..8398fe2b3d6 100644 --- a/crates/rome_js_formatter/src/ts/expressions/name_with_type_arguments.rs +++ b/crates/rome_js_formatter/src/ts/expressions/name_with_type_arguments.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNameWithTypeArguments, TsNameWithTypeArgumentsFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNameWithTypeArguments, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNameWithTypeArgumentsFields { name, diff --git a/crates/rome_js_formatter/src/ts/expressions/non_null_assertion_expression.rs b/crates/rome_js_formatter/src/ts/expressions/non_null_assertion_expression.rs index 0e552ef6461..1fbc8d7a3a0 100644 --- a/crates/rome_js_formatter/src/ts/expressions/non_null_assertion_expression.rs +++ b/crates/rome_js_formatter/src/ts/expressions/non_null_assertion_expression.rs @@ -8,7 +8,7 @@ impl FormatNodeFields { fn format_fields( node: &TsNonNullAssertionExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNonNullAssertionExpressionFields { expression, diff --git a/crates/rome_js_formatter/src/ts/expressions/template_chunk_element.rs b/crates/rome_js_formatter/src/ts/expressions/template_chunk_element.rs index 24d9c4150dd..f7f9faab895 100644 --- a/crates/rome_js_formatter/src/ts/expressions/template_chunk_element.rs +++ b/crates/rome_js_formatter/src/ts/expressions/template_chunk_element.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsTemplateChunkElement, TsTemplateChunkElementFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTemplateChunkElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTemplateChunkElementFields { template_chunk_token, diff --git a/crates/rome_js_formatter/src/ts/expressions/template_element.rs b/crates/rome_js_formatter/src/ts/expressions/template_element.rs index ef89a58f438..088d19d4ea5 100644 --- a/crates/rome_js_formatter/src/ts/expressions/template_element.rs +++ b/crates/rome_js_formatter/src/ts/expressions/template_element.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsTemplateElement; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTemplateElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_template_literal(TemplateElement::Ts(node.clone()), formatter) } diff --git a/crates/rome_js_formatter/src/ts/expressions/template_literal_type.rs b/crates/rome_js_formatter/src/ts/expressions/template_literal_type.rs index 48eeb01cef2..c97537e76c6 100644 --- a/crates/rome_js_formatter/src/ts/expressions/template_literal_type.rs +++ b/crates/rome_js_formatter/src/ts/expressions/template_literal_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsTemplateLiteralTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTemplateLiteralType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTemplateLiteralTypeFields { l_tick_token, diff --git a/crates/rome_js_formatter/src/ts/expressions/type_arguments.rs b/crates/rome_js_formatter/src/ts/expressions/type_arguments.rs index f820ada4351..03868e74f26 100644 --- a/crates/rome_js_formatter/src/ts/expressions/type_arguments.rs +++ b/crates/rome_js_formatter/src/ts/expressions/type_arguments.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeArguments, TsTypeArgumentsFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeArguments, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeArgumentsFields { l_angle_token, diff --git a/crates/rome_js_formatter/src/ts/expressions/type_assertion_expression.rs b/crates/rome_js_formatter/src/ts/expressions/type_assertion_expression.rs index d8c01ba3bfd..bbe0c3fbaf9 100644 --- a/crates/rome_js_formatter/src/ts/expressions/type_assertion_expression.rs +++ b/crates/rome_js_formatter/src/ts/expressions/type_assertion_expression.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsTypeAssertionExpressionFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeAssertionExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeAssertionExpressionFields { l_angle_token, diff --git a/crates/rome_js_formatter/src/ts/lists/enum_member_list.rs b/crates/rome_js_formatter/src/ts/lists/enum_member_list.rs index ba2210d2d32..108e496b952 100644 --- a/crates/rome_js_formatter/src/ts/lists/enum_member_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/enum_member_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::TsEnumMemberList; impl FormatRule for FormatTsEnumMemberList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsEnumMemberList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/ts/lists/index_signature_modifier_list.rs b/crates/rome_js_formatter/src/ts/lists/index_signature_modifier_list.rs index 447670a66ba..908bf9bb6f2 100644 --- a/crates/rome_js_formatter/src/ts/lists/index_signature_modifier_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/index_signature_modifier_list.rs @@ -4,11 +4,11 @@ use crate::utils::sort_modifiers_by_precedence; use rome_js_syntax::TsIndexSignatureModifierList; impl FormatRule for FormatTsIndexSignatureModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsIndexSignatureModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/ts/lists/intersection_type_element_list.rs b/crates/rome_js_formatter/src/ts/lists/intersection_type_element_list.rs index 5221a84a3fe..d0dfe719d81 100644 --- a/crates/rome_js_formatter/src/ts/lists/intersection_type_element_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/intersection_type_element_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::TsIntersectionTypeElementList; use rome_rowan::AstSeparatedList; impl FormatRule for FormatTsIntersectionTypeElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsIntersectionTypeElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut elements = Vec::with_capacity(node.len()); let last_index = node.len().saturating_sub(1); diff --git a/crates/rome_js_formatter/src/ts/lists/method_signature_modifier_list.rs b/crates/rome_js_formatter/src/ts/lists/method_signature_modifier_list.rs index 446f31a5a2a..78230abae99 100644 --- a/crates/rome_js_formatter/src/ts/lists/method_signature_modifier_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/method_signature_modifier_list.rs @@ -4,11 +4,11 @@ use crate::utils::sort_modifiers_by_precedence; use rome_js_syntax::TsMethodSignatureModifierList; impl FormatRule for FormatTsMethodSignatureModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsMethodSignatureModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/ts/lists/property_parameter_modifier_list.rs b/crates/rome_js_formatter/src/ts/lists/property_parameter_modifier_list.rs index fad586ed28a..789280a7dd2 100644 --- a/crates/rome_js_formatter/src/ts/lists/property_parameter_modifier_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/property_parameter_modifier_list.rs @@ -4,11 +4,11 @@ use crate::utils::sort_modifiers_by_precedence; use rome_js_syntax::TsPropertyParameterModifierList; impl FormatRule for FormatTsPropertyParameterModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsPropertyParameterModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/ts/lists/property_signature_modifier_list.rs b/crates/rome_js_formatter/src/ts/lists/property_signature_modifier_list.rs index 24909bbf1fd..e4ef92cbb60 100644 --- a/crates/rome_js_formatter/src/ts/lists/property_signature_modifier_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/property_signature_modifier_list.rs @@ -4,11 +4,11 @@ use crate::utils::sort_modifiers_by_precedence; use rome_js_syntax::TsPropertySignatureModifierList; impl FormatRule for FormatTsPropertySignatureModifierList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsPropertySignatureModifierList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( space_token(), diff --git a/crates/rome_js_formatter/src/ts/lists/template_element_list.rs b/crates/rome_js_formatter/src/ts/lists/template_element_list.rs index 40ead270445..09a99690e76 100644 --- a/crates/rome_js_formatter/src/ts/lists/template_element_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/template_element_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::TsTemplateElementList; use rome_rowan::AstNodeList; impl FormatRule for FormatTsTemplateElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsTemplateElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(concat_elements( formatter diff --git a/crates/rome_js_formatter/src/ts/lists/tuple_type_element_list.rs b/crates/rome_js_formatter/src/ts/lists/tuple_type_element_list.rs index 6e0aea2d678..29787b0024a 100644 --- a/crates/rome_js_formatter/src/ts/lists/tuple_type_element_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/tuple_type_element_list.rs @@ -3,11 +3,11 @@ use crate::prelude::*; use rome_js_syntax::TsTupleTypeElementList; impl FormatRule for FormatTsTupleTypeElementList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsTupleTypeElementList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/ts/lists/type_argument_list.rs b/crates/rome_js_formatter/src/ts/lists/type_argument_list.rs index f1e37e82ea5..372a7e37e8b 100644 --- a/crates/rome_js_formatter/src/ts/lists/type_argument_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/type_argument_list.rs @@ -4,11 +4,11 @@ use crate::prelude::*; use rome_js_syntax::TsTypeArgumentList; impl FormatRule for FormatTsTypeArgumentList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsTypeArgumentList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { Ok(join_elements( soft_line_break_or_space(), diff --git a/crates/rome_js_formatter/src/ts/lists/type_list.rs b/crates/rome_js_formatter/src/ts/lists/type_list.rs index b70dddd5c40..870e6b79ae3 100644 --- a/crates/rome_js_formatter/src/ts/lists/type_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/type_list.rs @@ -4,11 +4,11 @@ use crate::prelude::*; use rome_js_syntax::TsTypeList; impl FormatRule for FormatTsTypeList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsTypeList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { // the grouping will be applied by the parent Ok(join_elements( diff --git a/crates/rome_js_formatter/src/ts/lists/type_member_list.rs b/crates/rome_js_formatter/src/ts/lists/type_member_list.rs index d589b314c02..e6740e6a76a 100644 --- a/crates/rome_js_formatter/src/ts/lists/type_member_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/type_member_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::TsTypeMemberList; use rome_rowan::AstNodeList; impl FormatRule for FormatTsTypeMemberList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsTypeMemberList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let items = node.iter(); let last_index = items.len().saturating_sub(1); diff --git a/crates/rome_js_formatter/src/ts/lists/type_parameter_list.rs b/crates/rome_js_formatter/src/ts/lists/type_parameter_list.rs index 348348e9b05..10af43df842 100644 --- a/crates/rome_js_formatter/src/ts/lists/type_parameter_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/type_parameter_list.rs @@ -5,11 +5,11 @@ use rome_js_syntax::TsTypeParameterList; use rome_rowan::AstSeparatedList; impl FormatRule for FormatTsTypeParameterList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsTypeParameterList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { // nodes and formatter are not aware of the source type (TSX vs TS), which means we can't // exactly pin point the exact case. diff --git a/crates/rome_js_formatter/src/ts/lists/union_type_variant_list.rs b/crates/rome_js_formatter/src/ts/lists/union_type_variant_list.rs index 04d169a1258..0f17ca36fd9 100644 --- a/crates/rome_js_formatter/src/ts/lists/union_type_variant_list.rs +++ b/crates/rome_js_formatter/src/ts/lists/union_type_variant_list.rs @@ -4,11 +4,11 @@ use rome_js_syntax::TsUnionTypeVariantList; use rome_rowan::AstSeparatedList; impl FormatRule for FormatTsUnionTypeVariantList { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format( node: &TsUnionTypeVariantList, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut elements = Vec::with_capacity(node.len()); let last_index = node.len().saturating_sub(1); diff --git a/crates/rome_js_formatter/src/ts/module/export_as_namespace_clause.rs b/crates/rome_js_formatter/src/ts/module/export_as_namespace_clause.rs index 390c662d05f..1bb5cfbe8f2 100644 --- a/crates/rome_js_formatter/src/ts/module/export_as_namespace_clause.rs +++ b/crates/rome_js_formatter/src/ts/module/export_as_namespace_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::TsExportAsNamespaceClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsExportAsNamespaceClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsExportAsNamespaceClauseFields { as_token, diff --git a/crates/rome_js_formatter/src/ts/module/export_assignment_clause.rs b/crates/rome_js_formatter/src/ts/module/export_assignment_clause.rs index 273cf29c54c..9fcf7156a62 100644 --- a/crates/rome_js_formatter/src/ts/module/export_assignment_clause.rs +++ b/crates/rome_js_formatter/src/ts/module/export_assignment_clause.rs @@ -7,7 +7,7 @@ use rome_js_syntax::TsExportAssignmentClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsExportAssignmentClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsExportAssignmentClauseFields { eq_token, diff --git a/crates/rome_js_formatter/src/ts/module/export_declare_clause.rs b/crates/rome_js_formatter/src/ts/module/export_declare_clause.rs index 4df656b1aa0..29aa4332b03 100644 --- a/crates/rome_js_formatter/src/ts/module/export_declare_clause.rs +++ b/crates/rome_js_formatter/src/ts/module/export_declare_clause.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsExportDeclareClauseFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsExportDeclareClause, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsExportDeclareClauseFields { declare_token, diff --git a/crates/rome_js_formatter/src/ts/module/import_type.rs b/crates/rome_js_formatter/src/ts/module/import_type.rs index 762dd5e5ab0..333745e7022 100644 --- a/crates/rome_js_formatter/src/ts/module/import_type.rs +++ b/crates/rome_js_formatter/src/ts/module/import_type.rs @@ -7,7 +7,7 @@ use rome_js_syntax::TsImportTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsImportType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsImportTypeFields { typeof_token, diff --git a/crates/rome_js_formatter/src/ts/module/import_type_qualifier.rs b/crates/rome_js_formatter/src/ts/module/import_type_qualifier.rs index 191a4105943..b613e07b6ca 100644 --- a/crates/rome_js_formatter/src/ts/module/import_type_qualifier.rs +++ b/crates/rome_js_formatter/src/ts/module/import_type_qualifier.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsImportTypeQualifierFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsImportTypeQualifier, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsImportTypeQualifierFields { dot_token, right } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/statements/declare_statement.rs b/crates/rome_js_formatter/src/ts/statements/declare_statement.rs index 7854f10ec27..8b260a10756 100644 --- a/crates/rome_js_formatter/src/ts/statements/declare_statement.rs +++ b/crates/rome_js_formatter/src/ts/statements/declare_statement.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsDeclareStatementFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsDeclareStatement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsDeclareStatementFields { declaration, diff --git a/crates/rome_js_formatter/src/ts/types/any_type.rs b/crates/rome_js_formatter/src/ts/types/any_type.rs index 6e3ba11a633..0828ecfad1a 100644 --- a/crates/rome_js_formatter/src/ts/types/any_type.rs +++ b/crates/rome_js_formatter/src/ts/types/any_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsAnyType, TsAnyTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAnyType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAnyTypeFields { any_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/array_type.rs b/crates/rome_js_formatter/src/ts/types/array_type.rs index 372d2563787..f0a5d877947 100644 --- a/crates/rome_js_formatter/src/ts/types/array_type.rs +++ b/crates/rome_js_formatter/src/ts/types/array_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsArrayType, TsArrayTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsArrayType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsArrayTypeFields { l_brack_token, diff --git a/crates/rome_js_formatter/src/ts/types/asserts_return_type.rs b/crates/rome_js_formatter/src/ts/types/asserts_return_type.rs index c8aa3aca164..b52965b3912 100644 --- a/crates/rome_js_formatter/src/ts/types/asserts_return_type.rs +++ b/crates/rome_js_formatter/src/ts/types/asserts_return_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsAssertsReturnTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsAssertsReturnType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsAssertsReturnTypeFields { parameter_name, diff --git a/crates/rome_js_formatter/src/ts/types/big_int_literal_type.rs b/crates/rome_js_formatter/src/ts/types/big_int_literal_type.rs index e66398b2a21..b0351770464 100644 --- a/crates/rome_js_formatter/src/ts/types/big_int_literal_type.rs +++ b/crates/rome_js_formatter/src/ts/types/big_int_literal_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsBigIntLiteralType, TsBigIntLiteralTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsBigIntLiteralType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsBigIntLiteralTypeFields { minus_token, diff --git a/crates/rome_js_formatter/src/ts/types/bigint_type.rs b/crates/rome_js_formatter/src/ts/types/bigint_type.rs index ad0c078a65c..33a70691f8b 100644 --- a/crates/rome_js_formatter/src/ts/types/bigint_type.rs +++ b/crates/rome_js_formatter/src/ts/types/bigint_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsBigintType, TsBigintTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsBigintType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsBigintTypeFields { bigint_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/boolean_literal_type.rs b/crates/rome_js_formatter/src/ts/types/boolean_literal_type.rs index 9d0807c679e..5fa6c68ed2a 100644 --- a/crates/rome_js_formatter/src/ts/types/boolean_literal_type.rs +++ b/crates/rome_js_formatter/src/ts/types/boolean_literal_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsBooleanLiteralType, TsBooleanLiteralTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsBooleanLiteralType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsBooleanLiteralTypeFields { literal } = node.as_fields(); formatted![formatter, [literal.format()]] diff --git a/crates/rome_js_formatter/src/ts/types/boolean_type.rs b/crates/rome_js_formatter/src/ts/types/boolean_type.rs index c8999153c7b..f2f0de12472 100644 --- a/crates/rome_js_formatter/src/ts/types/boolean_type.rs +++ b/crates/rome_js_formatter/src/ts/types/boolean_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsBooleanType, TsBooleanTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsBooleanType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsBooleanTypeFields { boolean_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/conditional_type.rs b/crates/rome_js_formatter/src/ts/types/conditional_type.rs index a22595bca31..69e150b0476 100644 --- a/crates/rome_js_formatter/src/ts/types/conditional_type.rs +++ b/crates/rome_js_formatter/src/ts/types/conditional_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsConditionalType; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsConditionalType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { format_conditional(Conditional::Type(node.clone()), formatter, false) } diff --git a/crates/rome_js_formatter/src/ts/types/constructor_type.rs b/crates/rome_js_formatter/src/ts/types/constructor_type.rs index 60a8b49583a..b1a56829737 100644 --- a/crates/rome_js_formatter/src/ts/types/constructor_type.rs +++ b/crates/rome_js_formatter/src/ts/types/constructor_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsConstructorTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsConstructorType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsConstructorTypeFields { abstract_token, diff --git a/crates/rome_js_formatter/src/ts/types/function_type.rs b/crates/rome_js_formatter/src/ts/types/function_type.rs index 56dfb517c19..7114f109662 100644 --- a/crates/rome_js_formatter/src/ts/types/function_type.rs +++ b/crates/rome_js_formatter/src/ts/types/function_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsFunctionTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsFunctionType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsFunctionTypeFields { parameters, diff --git a/crates/rome_js_formatter/src/ts/types/indexed_access_type.rs b/crates/rome_js_formatter/src/ts/types/indexed_access_type.rs index 0debc01b26c..c572a8a6e1c 100644 --- a/crates/rome_js_formatter/src/ts/types/indexed_access_type.rs +++ b/crates/rome_js_formatter/src/ts/types/indexed_access_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsIndexedAccessTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsIndexedAccessType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsIndexedAccessTypeFields { object_type, diff --git a/crates/rome_js_formatter/src/ts/types/infer_type.rs b/crates/rome_js_formatter/src/ts/types/infer_type.rs index 809bc986c7f..6fd9b08fe20 100644 --- a/crates/rome_js_formatter/src/ts/types/infer_type.rs +++ b/crates/rome_js_formatter/src/ts/types/infer_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsInferType, TsInferTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsInferType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsInferTypeFields { infer_token, diff --git a/crates/rome_js_formatter/src/ts/types/intersection_type.rs b/crates/rome_js_formatter/src/ts/types/intersection_type.rs index f77c2132415..8d27bfc3ae7 100644 --- a/crates/rome_js_formatter/src/ts/types/intersection_type.rs +++ b/crates/rome_js_formatter/src/ts/types/intersection_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsIntersectionTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsIntersectionType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsIntersectionTypeFields { leading_separator_token, diff --git a/crates/rome_js_formatter/src/ts/types/mapped_type.rs b/crates/rome_js_formatter/src/ts/types/mapped_type.rs index 3f8e8c2d0b8..fa3e4ccdd71 100644 --- a/crates/rome_js_formatter/src/ts/types/mapped_type.rs +++ b/crates/rome_js_formatter/src/ts/types/mapped_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsMappedType, TsMappedTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsMappedType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsMappedTypeFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/ts/types/never_type.rs b/crates/rome_js_formatter/src/ts/types/never_type.rs index 3f12adb8b5b..f78a7ca70a5 100644 --- a/crates/rome_js_formatter/src/ts/types/never_type.rs +++ b/crates/rome_js_formatter/src/ts/types/never_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNeverType, TsNeverTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNeverType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNeverTypeFields { never_token } = node.as_fields(); formatted![formatter, [never_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/types/non_primitive_type.rs b/crates/rome_js_formatter/src/ts/types/non_primitive_type.rs index 10070a457d2..89cc68dee3b 100644 --- a/crates/rome_js_formatter/src/ts/types/non_primitive_type.rs +++ b/crates/rome_js_formatter/src/ts/types/non_primitive_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNonPrimitiveType, TsNonPrimitiveTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNonPrimitiveType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNonPrimitiveTypeFields { object_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/null_literal_type.rs b/crates/rome_js_formatter/src/ts/types/null_literal_type.rs index 3c4c64cf0f3..75d931d61e0 100644 --- a/crates/rome_js_formatter/src/ts/types/null_literal_type.rs +++ b/crates/rome_js_formatter/src/ts/types/null_literal_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNullLiteralType, TsNullLiteralTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNullLiteralType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNullLiteralTypeFields { literal_token } = node.as_fields(); formatted![formatter, [literal_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/types/number_literal_type.rs b/crates/rome_js_formatter/src/ts/types/number_literal_type.rs index ac823ff7ad5..ff3e53b8f00 100644 --- a/crates/rome_js_formatter/src/ts/types/number_literal_type.rs +++ b/crates/rome_js_formatter/src/ts/types/number_literal_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNumberLiteralType, TsNumberLiteralTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNumberLiteralType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNumberLiteralTypeFields { minus_token, diff --git a/crates/rome_js_formatter/src/ts/types/number_type.rs b/crates/rome_js_formatter/src/ts/types/number_type.rs index 3b33ab344a1..2e1407fb672 100644 --- a/crates/rome_js_formatter/src/ts/types/number_type.rs +++ b/crates/rome_js_formatter/src/ts/types/number_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsNumberType, TsNumberTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsNumberType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsNumberTypeFields { number_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/object_type.rs b/crates/rome_js_formatter/src/ts/types/object_type.rs index 88e0c34c7b1..b3ec0afeb9e 100644 --- a/crates/rome_js_formatter/src/ts/types/object_type.rs +++ b/crates/rome_js_formatter/src/ts/types/object_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsObjectType, TsObjectTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsObjectType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsObjectTypeFields { l_curly_token, diff --git a/crates/rome_js_formatter/src/ts/types/parenthesized_type.rs b/crates/rome_js_formatter/src/ts/types/parenthesized_type.rs index f1d6a3c218a..9392558595d 100644 --- a/crates/rome_js_formatter/src/ts/types/parenthesized_type.rs +++ b/crates/rome_js_formatter/src/ts/types/parenthesized_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsParenthesizedTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsParenthesizedType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsParenthesizedTypeFields { l_paren_token, diff --git a/crates/rome_js_formatter/src/ts/types/predicate_return_type.rs b/crates/rome_js_formatter/src/ts/types/predicate_return_type.rs index 61f8145e76c..649cb1aeaed 100644 --- a/crates/rome_js_formatter/src/ts/types/predicate_return_type.rs +++ b/crates/rome_js_formatter/src/ts/types/predicate_return_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsPredicateReturnTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsPredicateReturnType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsPredicateReturnTypeFields { parameter_name, diff --git a/crates/rome_js_formatter/src/ts/types/reference_type.rs b/crates/rome_js_formatter/src/ts/types/reference_type.rs index 110b039483c..a4bd6f57714 100644 --- a/crates/rome_js_formatter/src/ts/types/reference_type.rs +++ b/crates/rome_js_formatter/src/ts/types/reference_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsReferenceType, TsReferenceTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsReferenceType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsReferenceTypeFields { name, diff --git a/crates/rome_js_formatter/src/ts/types/string_literal_type.rs b/crates/rome_js_formatter/src/ts/types/string_literal_type.rs index a32e29e97bd..35acebad3c2 100644 --- a/crates/rome_js_formatter/src/ts/types/string_literal_type.rs +++ b/crates/rome_js_formatter/src/ts/types/string_literal_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::{TsStringLiteralType, TsStringLiteralTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsStringLiteralType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsStringLiteralTypeFields { literal_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/string_type.rs b/crates/rome_js_formatter/src/ts/types/string_type.rs index 440391e4534..147cc9ab519 100644 --- a/crates/rome_js_formatter/src/ts/types/string_type.rs +++ b/crates/rome_js_formatter/src/ts/types/string_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsStringType, TsStringTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsStringType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsStringTypeFields { string_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/symbol_type.rs b/crates/rome_js_formatter/src/ts/types/symbol_type.rs index 98279a7f1e0..b69ff2a64ea 100644 --- a/crates/rome_js_formatter/src/ts/types/symbol_type.rs +++ b/crates/rome_js_formatter/src/ts/types/symbol_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsSymbolType, TsSymbolTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsSymbolType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsSymbolTypeFields { symbol_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/this_type.rs b/crates/rome_js_formatter/src/ts/types/this_type.rs index b1fb249dec2..abc1d5e9197 100644 --- a/crates/rome_js_formatter/src/ts/types/this_type.rs +++ b/crates/rome_js_formatter/src/ts/types/this_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsThisType, TsThisTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsThisType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsThisTypeFields { this_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/tuple_type.rs b/crates/rome_js_formatter/src/ts/types/tuple_type.rs index 38c8939952c..eef7ed820ea 100644 --- a/crates/rome_js_formatter/src/ts/types/tuple_type.rs +++ b/crates/rome_js_formatter/src/ts/types/tuple_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTupleType, TsTupleTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTupleType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTupleTypeFields { l_brack_token, diff --git a/crates/rome_js_formatter/src/ts/types/type_operator_type.rs b/crates/rome_js_formatter/src/ts/types/type_operator_type.rs index 0a717725885..36a9e52764a 100644 --- a/crates/rome_js_formatter/src/ts/types/type_operator_type.rs +++ b/crates/rome_js_formatter/src/ts/types/type_operator_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeOperatorType, TsTypeOperatorTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeOperatorType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeOperatorTypeFields { operator_token, ty } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/typeof_type.rs b/crates/rome_js_formatter/src/ts/types/typeof_type.rs index 6724fa8a36a..a47b958cc04 100644 --- a/crates/rome_js_formatter/src/ts/types/typeof_type.rs +++ b/crates/rome_js_formatter/src/ts/types/typeof_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsTypeofType, TsTypeofTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsTypeofType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsTypeofTypeFields { typeof_token, diff --git a/crates/rome_js_formatter/src/ts/types/undefined_type.rs b/crates/rome_js_formatter/src/ts/types/undefined_type.rs index 1f04004b534..50d2235c6c7 100644 --- a/crates/rome_js_formatter/src/ts/types/undefined_type.rs +++ b/crates/rome_js_formatter/src/ts/types/undefined_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsUndefinedType, TsUndefinedTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsUndefinedType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsUndefinedTypeFields { undefined_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/ts/types/union_type.rs b/crates/rome_js_formatter/src/ts/types/union_type.rs index 0c8e14f744c..1407e294314 100644 --- a/crates/rome_js_formatter/src/ts/types/union_type.rs +++ b/crates/rome_js_formatter/src/ts/types/union_type.rs @@ -6,7 +6,7 @@ use rome_js_syntax::TsUnionTypeFields; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsUnionType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsUnionTypeFields { leading_separator_token, diff --git a/crates/rome_js_formatter/src/ts/types/unknown_type.rs b/crates/rome_js_formatter/src/ts/types/unknown_type.rs index 2d2fec9e54a..3396772afc2 100644 --- a/crates/rome_js_formatter/src/ts/types/unknown_type.rs +++ b/crates/rome_js_formatter/src/ts/types/unknown_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsUnknownType, TsUnknownTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsUnknownType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsUnknownTypeFields { unknown_token } = node.as_fields(); formatted![formatter, [unknown_token.format()]] diff --git a/crates/rome_js_formatter/src/ts/types/void_type.rs b/crates/rome_js_formatter/src/ts/types/void_type.rs index 3f13340265c..f28158be5f4 100644 --- a/crates/rome_js_formatter/src/ts/types/void_type.rs +++ b/crates/rome_js_formatter/src/ts/types/void_type.rs @@ -5,7 +5,7 @@ use rome_js_syntax::{TsVoidType, TsVoidTypeFields}; impl FormatNodeFields for FormatNodeRule { fn format_fields( node: &TsVoidType, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let TsVoidTypeFields { void_token } = node.as_fields(); diff --git a/crates/rome_js_formatter/src/utils/array.rs b/crates/rome_js_formatter/src/utils/array.rs index dd78d35a491..8a6403ad0fa 100644 --- a/crates/rome_js_formatter/src/utils/array.rs +++ b/crates/rome_js_formatter/src/utils/array.rs @@ -10,7 +10,7 @@ use rome_rowan::{AstNode, AstSeparatedList}; /// Utility function to print array-like nodes (array expressions, array bindings and assignment patterns) pub(crate) fn format_array_node( node: &N, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult where N: AstSeparatedList, diff --git a/crates/rome_js_formatter/src/utils/binary_like_expression.rs b/crates/rome_js_formatter/src/utils/binary_like_expression.rs index 8a90e1173fa..ed44aeebf8a 100644 --- a/crates/rome_js_formatter/src/utils/binary_like_expression.rs +++ b/crates/rome_js_formatter/src/utils/binary_like_expression.rs @@ -95,7 +95,7 @@ use std::iter::FusedIterator; /// which is what we wanted since the beginning! pub(crate) fn format_binary_like_expression( expression: JsAnyBinaryLikeExpression, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut flatten_items = FlattenItems::default(); let current_node = expression.syntax().clone(); @@ -169,7 +169,7 @@ fn format_with_or_without_parenthesis( parent_operator: BinaryLikeOperator, node: &JsSyntaxNode, formatted_node: FormatElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult<(FormatElement, bool)> { let compare_to = match JsAnyExpression::cast(node.clone()) { Some(JsAnyExpression::JsLogicalExpression(logical)) => { @@ -297,7 +297,7 @@ impl FlattenItems { &mut self, expression: JsAnyBinaryLikeExpression, parent_operator: Option, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult<()> { let should_flatten = expression.can_flatten()?; @@ -313,7 +313,7 @@ impl FlattenItems { &mut self, binary_like_expression: JsAnyBinaryLikeExpression, parent_operator: Option, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult<()> { let right = binary_like_expression.right()?; let has_comments = right.syntax().has_comments_direct(); @@ -340,7 +340,7 @@ impl FlattenItems { &mut self, binary_like_expression: JsAnyBinaryLikeExpression, parent_operator: Option, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult<()> { if let Some(last) = self.items.last_mut() { // Remove any line breaks and the trailing operator so that the operator/trailing aren't part @@ -415,7 +415,7 @@ impl FlattenItems { fn take_format_element( &mut self, current_node: &JsSyntaxNode, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let can_hard_group = can_hard_group(&self.items); let len = self.items.len(); @@ -867,9 +867,9 @@ impl AstNode for JsAnyBinaryLikeLeftExpression { } impl Format for JsAnyBinaryLikeLeftExpression { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(&self, formatter: &Formatter) -> FormatResult { + fn format(&self, formatter: &Formatter) -> FormatResult { match self { JsAnyBinaryLikeLeftExpression::JsAnyExpression(expression) => { formatted![formatter, [expression.format()]] diff --git a/crates/rome_js_formatter/src/utils/format_conditional.rs b/crates/rome_js_formatter/src/utils/format_conditional.rs index f4e2545740c..1e7140ac487 100644 --- a/crates/rome_js_formatter/src/utils/format_conditional.rs +++ b/crates/rome_js_formatter/src/utils/format_conditional.rs @@ -29,7 +29,7 @@ impl Conditional { fn into_format_element( self, - formatter: &Formatter, + formatter: &Formatter, parent_is_conditional: bool, ) -> FormatResult { let (head, body) = match self { @@ -46,7 +46,7 @@ impl Conditional { formatted![formatter, [head, body]] } - fn format_head(&self, formatter: &Formatter) -> FormatResult { + fn format_head(&self, formatter: &Formatter) -> FormatResult { match self { Conditional::Expression(expr) => { formatted![formatter, [expr.test()?.format(), space_token(),]] @@ -88,7 +88,7 @@ impl Conditional { fn format_body( &self, - formatter: &Formatter, + formatter: &Formatter, parent_is_conditional: bool, ) -> FormatResult { let mut left_or_right_is_conditional = false; @@ -127,7 +127,7 @@ impl Conditional { fn format_with_consequent( &self, - formatter: &Formatter, + formatter: &Formatter, consequent: Option, ) -> FormatResult { match self { @@ -174,7 +174,7 @@ impl Conditional { fn format_with_alternate( &self, - formatter: &Formatter, + formatter: &Formatter, alternate: Option, ) -> FormatResult { match self { @@ -225,7 +225,7 @@ impl Conditional { /// - [rome_js_syntax::JsConditionalExpression] pub fn format_conditional( conditional: Conditional, - formatter: &Formatter, + formatter: &Formatter, parent_is_conditional: bool, ) -> FormatResult { conditional.into_format_element(formatter, parent_is_conditional) diff --git a/crates/rome_js_formatter/src/utils/member_chain/groups.rs b/crates/rome_js_formatter/src/utils/member_chain/groups.rs index 0b563c08ed9..9c925026d81 100644 --- a/crates/rome_js_formatter/src/utils/member_chain/groups.rs +++ b/crates/rome_js_formatter/src/utils/member_chain/groups.rs @@ -1,8 +1,6 @@ use crate::prelude::*; use crate::utils::member_chain::flatten_item::FlattenItem; use crate::utils::member_chain::simple_argument::SimpleArgument; - -use crate::options::JsFormatOptions; use rome_js_syntax::JsCallExpression; use rome_rowan::{AstSeparatedList, SyntaxResult}; use std::mem; @@ -20,7 +18,7 @@ pub(crate) struct Groups<'f> { current_group: Vec, /// instance of the formatter - formatter: &'f Formatter, + formatter: &'f Formatter, /// This is a threshold of when we should start breaking the groups /// @@ -29,7 +27,7 @@ pub(crate) struct Groups<'f> { } impl<'f> Groups<'f> { - pub fn new(formatter: &'f Formatter, in_expression_statement: bool) -> Self { + pub fn new(formatter: &'f Formatter, in_expression_statement: bool) -> Self { Self { formatter, in_expression_statement, @@ -148,7 +146,7 @@ impl<'f> Groups<'f> { /// This is an heuristic needed to check when the first element of the group /// Should be part of the "head" or the "tail". fn should_not_wrap(&self, first_group: &HeadGroup) -> SyntaxResult { - let tab_with = self.formatter.options().tab_width(); + let tab_with = self.formatter.context().tab_width(); let has_computed_property = if self.groups.len() > 1 { // SAFETY: guarded by the previous check let group = &self.groups[0]; diff --git a/crates/rome_js_formatter/src/utils/member_chain/mod.rs b/crates/rome_js_formatter/src/utils/member_chain/mod.rs index f118f48fde0..480430fd625 100644 --- a/crates/rome_js_formatter/src/utils/member_chain/mod.rs +++ b/crates/rome_js_formatter/src/utils/member_chain/mod.rs @@ -119,7 +119,7 @@ use rome_rowan::AstNode; /// [Prettier applies]: https://github.com/prettier/prettier/blob/main/src/language-js/print/member-chain.js pub fn format_call_expression( syntax_node: &JsSyntaxNode, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut flattened_items = vec![]; let parent_is_expression_statement = syntax_node.parent().map_or(false, |parent| { @@ -234,7 +234,7 @@ fn compute_first_group_index(flatten_items: &[FlattenItem]) -> usize { fn compute_groups( flatten_items: impl Iterator, in_expression_statement: bool, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let mut has_seen_call_expression = false; let mut groups = Groups::new(formatter, in_expression_statement); @@ -320,7 +320,7 @@ fn format_groups( fn flatten_call_expression( queue: &mut Vec, node: JsSyntaxNode, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult<()> { match node.kind() { JsSyntaxKind::JS_CALL_EXPRESSION => { diff --git a/crates/rome_js_formatter/src/utils/mod.rs b/crates/rome_js_formatter/src/utils/mod.rs index 8a6bfef9e5b..a0dd283c86b 100644 --- a/crates/rome_js_formatter/src/utils/mod.rs +++ b/crates/rome_js_formatter/src/utils/mod.rs @@ -23,7 +23,7 @@ use rome_js_syntax::{JsSyntaxKind, JsSyntaxNode, JsSyntaxToken}; use rome_rowan::{AstNode, AstNodeList}; use std::borrow::Cow; -use crate::options::{JsFormatOptions, QuoteStyle}; +use crate::context::QuoteStyle; pub(crate) use simple::*; /// Utility function to format the separators of the nodes that belong to the unions @@ -34,7 +34,7 @@ pub(crate) use simple::*; /// So here, we create - on purpose - an empty node. pub(crate) fn format_type_member_separator( separator_token: Option, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatElement { if let Some(separator) = separator_token { formatter.format_replaced(&separator, empty_element()) @@ -45,7 +45,7 @@ pub(crate) fn format_type_member_separator( /// Utility function to format the node [rome_js_syntax::JsInitializerClause] pub(crate) fn format_initializer_clause( - formatter: &Formatter, + formatter: &Formatter, initializer: Option, ) -> FormatResult { formatted![ @@ -58,7 +58,7 @@ pub(crate) fn format_initializer_clause( pub(crate) fn format_interpreter( interpreter: Option, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { formatted![ formatter, @@ -123,7 +123,7 @@ pub(crate) fn has_leading_newline(node: &JsSyntaxNode) -> bool { /// This will place the head element inside a [hard_group_elements], but /// the body will broken out of flat printing if its a single statement pub(crate) fn format_head_body_statement( - formatter: &Formatter, + formatter: &Formatter, head: FormatElement, body: JsAnyStatement, ) -> FormatResult { @@ -158,7 +158,7 @@ where /// Utility to format pub(crate) fn format_template_chunk( chunk: JsSyntaxToken, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { // Per https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#sec-static-semantics-trv: // In template literals, the '\r' and '\r\n' line terminators are normalized to '\n' @@ -175,7 +175,7 @@ pub(crate) fn format_template_chunk( /// Function to format template literals and template literal types pub(crate) fn format_template_literal( literal: TemplateElement, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { literal.into_format_element(formatter) } @@ -188,7 +188,7 @@ pub(crate) enum TemplateElement { impl TemplateElement { pub fn into_format_element( self, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatResult { let expression_is_plain = self.is_plain_expression()?; let has_comments = self.has_comments(); @@ -364,7 +364,7 @@ impl FormatPrecedence { /// semicolon insertion if it was missing in the input source and the /// preceeding element wasn't an unknown node pub(crate) fn format_with_semicolon( - formatter: &Formatter, + formatter: &Formatter, content: FormatElement, semicolon: Option, ) -> FormatResult { @@ -388,10 +388,10 @@ pub(crate) fn format_with_semicolon( pub(crate) fn format_string_literal_token( token: JsSyntaxToken, - formatter: &Formatter, + formatter: &Formatter, ) -> FormatElement { let quoted = token.text_trimmed(); - let (primary_quote_char, secondary_quote_char) = match formatter.options().quote_style { + let (primary_quote_char, secondary_quote_char) = match formatter.context().quote_style() { QuoteStyle::Double => ('"', '\''), QuoteStyle::Single => ('\'', '"'), }; diff --git a/crates/rome_js_formatter/tests/check_reformat.rs b/crates/rome_js_formatter/tests/check_reformat.rs index dfc0505bf46..59c79683511 100644 --- a/crates/rome_js_formatter/tests/check_reformat.rs +++ b/crates/rome_js_formatter/tests/check_reformat.rs @@ -1,6 +1,6 @@ use rome_diagnostics::{file::SimpleFiles, termcolor, Emitter}; +use rome_js_formatter::context::JsFormatContext; use rome_js_formatter::format_node; -use rome_js_formatter::options::JsFormatOptions; use rome_js_parser::parse; use rome_js_syntax::{JsSyntaxNode, SourceType}; @@ -9,7 +9,7 @@ pub struct CheckReformatParams<'a> { pub text: &'a str, pub source_type: SourceType, pub file_name: &'a str, - pub format_options: JsFormatOptions, + pub format_context: JsFormatContext, } /// Perform a second pass of formatting on a file, printing a diff if the @@ -20,7 +20,7 @@ pub fn check_reformat(params: CheckReformatParams) { text, source_type, file_name, - format_options, + format_context: format_options, } = params; let re_parse = parse(text, 0, source_type); diff --git a/crates/rome_js_formatter/tests/prettier_tests.rs b/crates/rome_js_formatter/tests/prettier_tests.rs index 297aaa8621d..531d6e2601c 100644 --- a/crates/rome_js_formatter/tests/prettier_tests.rs +++ b/crates/rome_js_formatter/tests/prettier_tests.rs @@ -14,7 +14,7 @@ use std::{ use rome_diagnostics::{file::SimpleFiles, termcolor, Emitter}; use rome_formatter::IndentStyle; -use rome_js_formatter::options::JsFormatOptions; +use rome_js_formatter::context::JsFormatContext; use rome_js_parser::parse; use rome_js_syntax::SourceType; @@ -53,14 +53,14 @@ fn test_snapshot(input: &'static str, _: &str, _: &str, _: &str) { input_file.try_into().unwrap() }; - let parsed = parse(&parse_input, 0, source_type.clone()); + let parsed = parse(&parse_input, 0, source_type); let has_errors = parsed.has_errors(); let syntax = parsed.syntax(); - let options = JsFormatOptions { + let context = JsFormatContext { indent_style: IndentStyle::Space(2), - ..JsFormatOptions::default() + ..JsFormatContext::default() }; let result = match (range_start_index, range_end_index) { @@ -72,7 +72,7 @@ fn test_snapshot(input: &'static str, _: &str, _: &str, _: &str) { } rome_js_formatter::format_range( - options, + context, &syntax, TextRange::new( TextSize::try_from(start).unwrap(), @@ -80,7 +80,7 @@ fn test_snapshot(input: &'static str, _: &str, _: &str, _: &str) { ), ) } - _ => rome_js_formatter::format_node(options, &syntax).map(|formatted| formatted.print()), + _ => rome_js_formatter::format_node(context, &syntax).map(|formatted| formatted.print()), }; let formatted = result.expect("formatting failed"); @@ -104,7 +104,7 @@ fn test_snapshot(input: &'static str, _: &str, _: &str, _: &str) { text: &result, source_type, file_name, - format_options: options, + format_context: context, }); } @@ -153,7 +153,7 @@ fn test_snapshot(input: &'static str, _: &str, _: &str, _: &str) { writeln!(snapshot).unwrap(); } - let max_width = options.line_width.value() as usize; + let max_width = context.line_width.value() as usize; let mut lines_exceeding_max_width = formatted .lines() .enumerate() diff --git a/crates/rome_js_formatter/tests/spec_test.rs b/crates/rome_js_formatter/tests/spec_test.rs index 06adb3b59d2..a08efa71f18 100644 --- a/crates/rome_js_formatter/tests/spec_test.rs +++ b/crates/rome_js_formatter/tests/spec_test.rs @@ -1,8 +1,8 @@ use rome_formatter::LineWidth; use rome_formatter::{IndentStyle, Printed}; use rome_fs::RomePath; +use rome_js_formatter::context::{JsFormatContext, JsFormatOptions, QuoteStyle}; use rome_js_formatter::format_node; -use rome_js_formatter::options::{JsFormatOptions, QuoteStyle}; use rome_js_parser::parse; use rome_js_syntax::{ModuleKind, SourceType}; use rome_service::workspace::{FeatureName, SupportsFeatureParams}; @@ -49,7 +49,7 @@ impl From for QuoteStyle { } #[derive(Debug, Deserialize, Serialize, Clone, Copy)] -pub struct SerializableFormatOptions { +pub struct SerializableFormatContext { /// The indent style. pub indent_style: Option, @@ -60,8 +60,8 @@ pub struct SerializableFormatOptions { pub quote_style: Option, } -impl From for JsFormatOptions { - fn from(test: SerializableFormatOptions) -> Self { +impl From for JsFormatContext { + fn from(test: SerializableFormatContext) -> Self { Self { indent_style: test .indent_style @@ -70,26 +70,29 @@ impl From for JsFormatOptions { .line_width .and_then(|width| LineWidth::try_from(width).ok()) .unwrap_or_default(), - quote_style: test - .quote_style - .map_or_else(|| QuoteStyle::Double, |value| value.into()), + options: JsFormatOptions { + quote_style: test + .quote_style + .map_or_else(|| QuoteStyle::Double, |value| value.into()), + }, + source_type: SourceType::default(), } } } #[derive(Debug, Deserialize, Serialize)] struct TestOptions { - cases: Vec, + cases: Vec, } #[derive(Debug, Default)] struct SnapshotContent { input: String, - output: Vec<(String, JsFormatOptions)>, + output: Vec<(String, JsFormatContext)>, } impl SnapshotContent { - fn add_output(&mut self, formatted: Printed, options: JsFormatOptions) { + fn add_output(&mut self, formatted: Printed, options: JsFormatContext) { let code = formatted.as_code(); let mut output: String = code.to_string(); if !formatted.verbatim_ranges().is_empty() { @@ -194,12 +197,12 @@ pub fn run(spec_input_file: &str, _expected_file: &str, test_directory: &str, fi let input = fs::read_to_string(file_path).unwrap(); snapshot_content.set_input(input.as_str()); - let parsed = parse(buffer.as_str(), 0, source_type.clone()); + let parsed = parse(buffer.as_str(), 0, source_type); let has_errors = parsed.has_errors(); let root = parsed.syntax(); // we ignore the error for now - let formatted = format_node(JsFormatOptions::default(), &root).unwrap(); + let formatted = format_node(JsFormatContext::default(), &root).unwrap(); let printed = formatted.print(); let file_name = spec_input_file.file_name().unwrap().to_str().unwrap(); @@ -207,13 +210,13 @@ pub fn run(spec_input_file: &str, _expected_file: &str, test_directory: &str, fi check_reformat::check_reformat(check_reformat::CheckReformatParams { root: &root, text: printed.as_code(), - source_type: source_type.clone(), + source_type, file_name, - format_options: JsFormatOptions::default(), + format_context: JsFormatContext::default(), }); } - snapshot_content.add_output(printed, JsFormatOptions::default()); + snapshot_content.add_output(printed, JsFormatContext::default()); let test_directory = PathBuf::from(test_directory); let options_path = test_directory.join("options.json"); @@ -225,21 +228,24 @@ pub fn run(spec_input_file: &str, _expected_file: &str, test_directory: &str, fi serde_json::from_str(options_path.get_buffer_from_file().as_str()).unwrap(); for test_case in options.cases { - let format_options: JsFormatOptions = test_case.into(); - let formatted = format_node(format_options, &root).unwrap(); + let mut format_context: JsFormatContext = test_case.into(); + // we don't track the source type inside the serializable structs, so we + // inject it here + format_context.source_type = source_type; + let formatted = format_node(format_context, &root).unwrap(); let printed = formatted.print(); if !has_errors { check_reformat::check_reformat(check_reformat::CheckReformatParams { root: &root, text: printed.as_code(), - source_type: source_type.clone(), + source_type, file_name, - format_options, + format_context, }); } - snapshot_content.add_output(printed, format_options); + snapshot_content.add_output(printed, format_context); } } } diff --git a/crates/rome_js_syntax/src/source_type.rs b/crates/rome_js_syntax/src/source_type.rs index d04274ad78f..1156ba57489 100644 --- a/crates/rome_js_syntax/src/source_type.rs +++ b/crates/rome_js_syntax/src/source_type.rs @@ -102,7 +102,7 @@ impl Default for Language { } } -#[derive(Clone, Debug, Default)] +#[derive(Clone, Copy, Debug, Default)] pub struct SourceType { language: Language, variant: LanguageVariant, diff --git a/crates/rome_lsp/src/config.rs b/crates/rome_lsp/src/config.rs index c67ef2d6320..ba6e62836a5 100644 --- a/crates/rome_lsp/src/config.rs +++ b/crates/rome_lsp/src/config.rs @@ -1,5 +1,5 @@ use rome_formatter::{IndentStyle, LineWidth}; -use rome_js_formatter::options::QuoteStyle; +use rome_js_formatter::context::QuoteStyle; use rome_service::settings; use serde::{Deserialize, Serialize}; use serde_json::{Error, Value}; diff --git a/crates/rome_service/src/file_handlers/javascript.rs b/crates/rome_service/src/file_handlers/javascript.rs index eec19408b60..7fecab8fb98 100644 --- a/crates/rome_service/src/file_handlers/javascript.rs +++ b/crates/rome_service/src/file_handlers/javascript.rs @@ -2,8 +2,8 @@ use rome_analyze::{analyze, AnalysisFilter, AnalyzerAction, RuleCategories}; use rome_diagnostics::Diagnostic; use rome_formatter::{IndentStyle, LineWidth, Printed}; use rome_fs::RomePath; -use rome_js_formatter::options::QuoteStyle; -use rome_js_formatter::{format_node, options::JsFormatOptions}; +use rome_js_formatter::context::{JsFormatOptions, QuoteStyle}; +use rome_js_formatter::{context::JsFormatContext, format_node}; use rome_js_parser::Parse; use rome_js_syntax::{JsAnyRoot, JsLanguage, SourceType, TextRange, TextSize, TokenAtOffset}; use rome_rowan::AstNode; @@ -26,18 +26,19 @@ pub struct JsFormatSettings { impl Language for JsLanguage { type FormatSettings = JsFormatSettings; - type FormatOptions = JsFormatOptions; + type FormatContext = JsFormatContext; fn lookup_settings(languages: &LanguagesSettings) -> &LanguageSettings { &languages.javascript } - fn resolve_format_options( + fn resolve_format_context( global: &FormatSettings, language: &JsFormatSettings, editor: IndentStyle, - ) -> JsFormatOptions { - JsFormatOptions { + path: &RomePath, + ) -> JsFormatContext { + JsFormatContext { indent_style: language .indent_style .or(global.indent_style) @@ -46,7 +47,10 @@ impl Language for JsLanguage { .line_width .or(global.line_width) .unwrap_or_default(), - quote_style: language.quote_style.unwrap_or_default(), + options: JsFormatOptions { + quote_style: language.quote_style.unwrap_or_default(), + }, + source_type: path.as_path().try_into().unwrap_or_default(), } } } @@ -156,38 +160,38 @@ fn code_actions(rome_path: &RomePath, parse: AnyParse, range: TextRange) -> Vec< } fn format( - _rome_path: &RomePath, + rome_path: &RomePath, parse: AnyParse, settings: SettingsHandle, ) -> Result { - let options = settings.format_options::(); + let context = settings.format_context::(rome_path); let tree = parse.syntax(); - let formatted = format_node(options, &tree)?; + let formatted = format_node(context, &tree)?; let printed = formatted.print(); Ok(printed) } fn format_range( - _rome_path: &RomePath, + rome_path: &RomePath, parse: AnyParse, settings: SettingsHandle, range: TextRange, ) -> Result { - let options = settings.format_options::(); + let context = settings.format_context::(rome_path); let tree = parse.syntax(); - let printed = rome_js_formatter::format_range(options, &tree, range)?; + let printed = rome_js_formatter::format_range(context, &tree, range)?; Ok(printed) } fn format_on_type( - _rome_path: &RomePath, + rome_path: &RomePath, parse: AnyParse, settings: SettingsHandle, offset: TextSize, ) -> Result { - let options = settings.format_options::(); + let context = settings.format_context::(rome_path); let tree = parse.syntax(); @@ -205,6 +209,6 @@ fn format_on_type( None => panic!("found a token with no parent"), }; - let printed = rome_js_formatter::format_sub_tree(options, &root_node)?; + let printed = rome_js_formatter::format_sub_tree(context, &root_node)?; Ok(printed) } diff --git a/crates/rome_service/src/settings.rs b/crates/rome_service/src/settings.rs index feba31f8d85..85653b05924 100644 --- a/crates/rome_service/src/settings.rs +++ b/crates/rome_service/src/settings.rs @@ -1,6 +1,7 @@ use std::sync::{RwLock, RwLockReadGuard}; use rome_formatter::{IndentStyle, LineWidth}; +use rome_fs::RomePath; use rome_js_syntax::JsLanguage; /// Global settings for the entire workspace @@ -32,18 +33,19 @@ pub trait Language: rome_rowan::Language { /// Formatter settings type for this language type FormatSettings: Default; /// Fully resolved formatter options type for this language - type FormatOptions: rome_formatter::FormatOptions; + type FormatContext: rome_formatter::FormatContext; /// Read the settings type for this language from the [LanguagesSettings] map fn lookup_settings(languages: &LanguagesSettings) -> &LanguageSettings; /// Resolve the formatter options from the global (workspace level), /// per-language and editor provided formatter settings - fn resolve_format_options( + fn resolve_format_context( global: &FormatSettings, language: &Self::FormatSettings, editor: IndentStyle, - ) -> Self::FormatOptions; + path: &RomePath, + ) -> Self::FormatContext; } #[derive(Default)] @@ -76,15 +78,16 @@ impl<'a, E> AsRef for SettingsHandle<'a, E> { } impl<'a> SettingsHandle<'a, IndentStyle> { - /// Resolve the formatting options for the given language - pub(crate) fn format_options(self) -> L::FormatOptions + /// Resolve the formatting context for the given language + pub(crate) fn format_context(self, path: &RomePath) -> L::FormatContext where L: Language, { - L::resolve_format_options( + L::resolve_format_context( &self.inner.format, &L::lookup_settings(&self.inner.languages).format, self.editor, + path, ) } } diff --git a/website/playground/src/lib.rs b/website/playground/src/lib.rs index cae189e3082..b0886e5ed44 100644 --- a/website/playground/src/lib.rs +++ b/website/playground/src/lib.rs @@ -5,8 +5,8 @@ use rome_diagnostics::file::SimpleFiles; use rome_diagnostics::termcolor::{ColorSpec, WriteColor}; use rome_diagnostics::Emitter; use rome_formatter::IndentStyle; +use rome_js_formatter::context::{JsFormatContext, JsFormatOptions}; use rome_js_formatter::format_node; -use rome_js_formatter::options::JsFormatOptions; use rome_js_parser::parse; use rome_js_syntax::{LanguageVariant, SourceType}; use serde_json::json; @@ -173,10 +173,13 @@ pub fn run( IndentStyle::Tab }; - let options = JsFormatOptions { + let context = JsFormatContext { indent_style, line_width: options.line_width.try_into().unwrap_or_default(), - quote_style: options.quote_style.parse().unwrap_or_default(), + options: JsFormatOptions { + quote_style: options.quote_style.parse().unwrap_or_default(), + }, + source_type, }; let (cst, ast) = if output_json { @@ -195,7 +198,7 @@ pub fn run( (format!("{:#?}", syntax), format!("{:#?}", parse.tree())) }; - let formatted = format_node(options, &syntax).unwrap(); + let formatted = format_node(context, &syntax).unwrap(); let formatted_code = formatted.print().into_code(); let root_element = formatted.into_format_element(); diff --git a/xtask/bench/src/features/formatter.rs b/xtask/bench/src/features/formatter.rs index b8a4ee0d503..8c3f38f1ad6 100644 --- a/xtask/bench/src/features/formatter.rs +++ b/xtask/bench/src/features/formatter.rs @@ -1,7 +1,7 @@ use crate::BenchmarkSummary; use rome_formatter::Printed; +use rome_js_formatter::context::JsFormatContext; use rome_js_formatter::format_node; -use rome_js_formatter::options::JsFormatOptions; use rome_js_syntax::JsSyntaxNode; use std::fmt::{Display, Formatter}; use std::time::Duration; @@ -23,7 +23,7 @@ pub fn benchmark_format_lib(id: &str, root: &JsSyntaxNode) -> BenchmarkSummary { } pub fn run_format(root: &JsSyntaxNode) -> Printed { - format_node(JsFormatOptions::default(), root) + format_node(JsFormatContext::default(), root) .unwrap() .print() } diff --git a/xtask/bench/src/lib.rs b/xtask/bench/src/lib.rs index 8d92e59e737..f395d8465bf 100644 --- a/xtask/bench/src/lib.rs +++ b/xtask/bench/src/lib.rs @@ -142,16 +142,16 @@ pub fn run(args: RunArgs) { group.bench_function(&id, |b| match args.feature { FeatureToBenchmark::Parser => b.iter(|| { - criterion::black_box(run_parse(code, source_type.clone())); + criterion::black_box(run_parse(code, source_type)); }), FeatureToBenchmark::Formatter => { - let root = parse(code, 0, source_type.clone()).syntax(); + let root = parse(code, 0, source_type).syntax(); b.iter(|| { criterion::black_box(run_format(&root)); }) } FeatureToBenchmark::Analyzer => { - let root = parse(code, 0, source_type.clone()).tree(); + let root = parse(code, 0, source_type).tree(); b.iter(|| { run_analyzer(&root); }) @@ -162,14 +162,14 @@ pub fn run(args: RunArgs) { //warmup match args.feature { FeatureToBenchmark::Parser => { - run_parse(code, source_type.clone()); + run_parse(code, source_type); } FeatureToBenchmark::Formatter => { - let root = parse(code, 0, source_type.clone()).syntax(); + let root = parse(code, 0, source_type).syntax(); run_format(&root); } FeatureToBenchmark::Analyzer => { - let root = parse(code, 0, source_type.clone()).tree(); + let root = parse(code, 0, source_type).tree(); run_analyzer(&root); } } diff --git a/xtask/codegen/src/formatter.rs b/xtask/codegen/src/formatter.rs index f48d919fac3..5b9b9a1c897 100644 --- a/xtask/codegen/src/formatter.rs +++ b/xtask/codegen/src/formatter.rs @@ -309,9 +309,9 @@ pub fn generate_formatter() { use rome_js_syntax::#node_id; impl FormatRule<#node_id> for #format_id { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(node: &#node_id, formatter: &Formatter) -> FormatResult { + fn format(node: &#node_id, formatter: &Formatter) -> FormatResult { Ok(formatter.format_list(node)) } } @@ -323,9 +323,9 @@ pub fn generate_formatter() { use rome_js_syntax::#node_id; impl FormatRule<#node_id> for #format_id { - type Options = JsFormatOptions; + type Context = JsFormatContext; - fn format(node: &#node_id, formatter: &Formatter) -> FormatResult { + fn format(node: &#node_id, formatter: &Formatter) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } } @@ -338,7 +338,7 @@ pub fn generate_formatter() { use rome_js_syntax::#node_id; impl FormatNodeFields<#node_id> for FormatNodeRule<#node_id> { - fn format_fields(node: &#node_id, formatter: &Formatter) -> FormatResult { + fn format_fields(node: &#node_id, formatter: &Formatter) -> FormatResult { verbatim_node(node.syntax()).format(formatter) } } @@ -352,7 +352,7 @@ pub fn generate_formatter() { use rome_js_syntax::#node_id; impl FormatNodeFields<#node_id> for FormatNodeRule<#node_id> { - fn format_fields(node: &#node_id, formatter: &Formatter) -> FormatResult { + fn format_fields(node: &#node_id, formatter: &Formatter) -> FormatResult { unknown_node(node.syntax()).format(formatter) } } @@ -374,7 +374,7 @@ pub fn generate_formatter() { use rome_js_syntax::#node_id; impl FormatRule<#node_id> for #format_id { - type Options = JsFormatOptions; + type Context = JsFormatContext; fn format(node: &#node_id, formatter: &Formatter) -> FormatResult { match node { diff --git a/xtask/coverage/src/js/test262.rs b/xtask/coverage/src/js/test262.rs index 9bc3b974ae3..59bfdc68492 100644 --- a/xtask/coverage/src/js/test262.rs +++ b/xtask/coverage/src/js/test262.rs @@ -97,8 +97,7 @@ impl Test262TestCase { .filter(|neg| neg.phase == Phase::Parse) .is_some(); - let files = - TestCaseFiles::single(self.name.clone(), self.code.clone(), source_type.clone()); + let files = TestCaseFiles::single(self.name.clone(), self.code.clone(), source_type); match parse(&code, 0, source_type).ok() { Ok(root) if !should_fail => { diff --git a/xtask/coverage/src/jsx/jsx_babel.rs b/xtask/coverage/src/jsx/jsx_babel.rs index bffbf130a32..2120d52c056 100644 --- a/xtask/coverage/src/jsx/jsx_babel.rs +++ b/xtask/coverage/src/jsx/jsx_babel.rs @@ -36,11 +36,7 @@ impl TestCase for BabelJsxTestCase { fn run(&self) -> TestRunOutcome { let source_type = SourceType::jsx().with_module_kind(ModuleKind::Script); - let files = TestCaseFiles::single( - self.name().to_string(), - self.code.clone(), - source_type.clone(), - ); + let files = TestCaseFiles::single(self.name().to_string(), self.code.clone(), source_type); let result = parse(&self.code, 0, source_type); if result.diagnostics().is_empty() { diff --git a/xtask/coverage/src/runner.rs b/xtask/coverage/src/runner.rs index f004834d0e9..cf22c1bdeec 100644 --- a/xtask/coverage/src/runner.rs +++ b/xtask/coverage/src/runner.rs @@ -82,7 +82,7 @@ pub(crate) struct TestCaseFile { impl TestCaseFile { pub(crate) fn parse(&self) -> Parse { - parse(&self.code, self.id, self.source_type.clone()) + parse(&self.code, self.id, self.source_type) } pub(crate) fn name(&self) -> &str { diff --git a/xtask/coverage/src/ts/ts_babel.rs b/xtask/coverage/src/ts/ts_babel.rs index 085c153b35e..6b365a7b970 100644 --- a/xtask/coverage/src/ts/ts_babel.rs +++ b/xtask/coverage/src/ts/ts_babel.rs @@ -42,11 +42,7 @@ impl TestCase for BabelTypescriptTestCase { fn run(&self) -> TestRunOutcome { let source_type = SourceType::ts().with_variant(self.variant); - let files = TestCaseFiles::single( - self.name().to_string(), - self.code.clone(), - source_type.clone(), - ); + let files = TestCaseFiles::single(self.name().to_string(), self.code.clone(), source_type); let result = rome_js_parser::parse(&self.code, 0, source_type);