diff --git a/crates/oxc_formatter/src/ast_nodes/generated/format.rs b/crates/oxc_formatter/src/ast_nodes/generated/format.rs index 8a951bd4181d3..de820b2b4bfba 100644 --- a/crates/oxc_formatter/src/ast_nodes/generated/format.rs +++ b/crates/oxc_formatter/src/ast_nodes/generated/format.rs @@ -9,8 +9,8 @@ use crate::{ ast_nodes::AstNode, formatter::{Format, Formatter}, parentheses::NeedsParentheses, + print::{FormatFunctionOptions, FormatJsArrowFunctionExpressionOptions, FormatWrite}, utils::{suppressed::FormatSuppressedNode, typecast::format_type_cast_comment_node}, - write::{FormatFunctionOptions, FormatJsArrowFunctionExpressionOptions, FormatWrite}, }; impl<'a> Format<'a> for AstNode<'a, Program<'a>> { diff --git a/crates/oxc_formatter/src/lib.rs b/crates/oxc_formatter/src/lib.rs index 04c96cec5d597..489ebf0121dd2 100644 --- a/crates/oxc_formatter/src/lib.rs +++ b/crates/oxc_formatter/src/lib.rs @@ -8,9 +8,9 @@ mod formatter; mod ir_transform; mod options; mod parentheses; +mod print; mod service; mod utils; -mod write; use oxc_allocator::Allocator; use oxc_ast::ast::*; diff --git a/crates/oxc_formatter/src/parentheses/expression.rs b/crates/oxc_formatter/src/parentheses/expression.rs index 881fbdb50d964..0236f6c96fae3 100644 --- a/crates/oxc_formatter/src/parentheses/expression.rs +++ b/crates/oxc_formatter/src/parentheses/expression.rs @@ -6,8 +6,8 @@ use oxc_span::GetSpan; use crate::{ ast_nodes::{AstNode, AstNodes}, formatter::Formatter, + print::{BinaryLikeExpression, should_flatten}, utils::expression::ExpressionLeftSide, - write::{BinaryLikeExpression, should_flatten}, }; use super::NeedsParentheses; diff --git a/crates/oxc_formatter/src/write/array_element_list.rs b/crates/oxc_formatter/src/print/array_element_list.rs similarity index 100% rename from crates/oxc_formatter/src/write/array_element_list.rs rename to crates/oxc_formatter/src/print/array_element_list.rs diff --git a/crates/oxc_formatter/src/write/array_expression.rs b/crates/oxc_formatter/src/print/array_expression.rs similarity index 100% rename from crates/oxc_formatter/src/write/array_expression.rs rename to crates/oxc_formatter/src/print/array_expression.rs diff --git a/crates/oxc_formatter/src/write/array_pattern.rs b/crates/oxc_formatter/src/print/array_pattern.rs similarity index 100% rename from crates/oxc_formatter/src/write/array_pattern.rs rename to crates/oxc_formatter/src/print/array_pattern.rs diff --git a/crates/oxc_formatter/src/write/arrow_function_expression.rs b/crates/oxc_formatter/src/print/arrow_function_expression.rs similarity index 99% rename from crates/oxc_formatter/src/write/arrow_function_expression.rs rename to crates/oxc_formatter/src/print/arrow_function_expression.rs index f28c8ed4dffdf..f776ab4d68f36 100644 --- a/crates/oxc_formatter/src/write/arrow_function_expression.rs +++ b/crates/oxc_formatter/src/print/arrow_function_expression.rs @@ -9,12 +9,12 @@ use crate::{ trivia::FormatTrailingComments, }, options::FormatTrailingCommas, + print::function::FormatContentWithCacheMode, utils::{ assignment_like::AssignmentLikeLayout, expression::ExpressionLeftSide, format_node_without_trailing_comments::FormatNodeWithoutTrailingComments, }, write, - write::function::FormatContentWithCacheMode, }; use super::{FormatWrite, parameters::has_only_simple_parameters}; diff --git a/crates/oxc_formatter/src/write/as_or_satisfies_expression.rs b/crates/oxc_formatter/src/print/as_or_satisfies_expression.rs similarity index 98% rename from crates/oxc_formatter/src/write/as_or_satisfies_expression.rs rename to crates/oxc_formatter/src/print/as_or_satisfies_expression.rs index 9ab3f57615f59..49dbbc334fa89 100644 --- a/crates/oxc_formatter/src/write/as_or_satisfies_expression.rs +++ b/crates/oxc_formatter/src/print/as_or_satisfies_expression.rs @@ -4,8 +4,8 @@ use oxc_span::GetSpan; use crate::{ ast_nodes::{AstNode, AstNodes}, formatter::{Formatter, prelude::*, trivia::FormatTrailingComments}, + print::{FormatNodeWithoutTrailingComments, FormatWrite}, write, - write::{FormatNodeWithoutTrailingComments, FormatWrite}, }; impl<'a> FormatWrite<'a> for AstNode<'a, TSAsExpression<'a>> { diff --git a/crates/oxc_formatter/src/write/assignment_pattern_property_list.rs b/crates/oxc_formatter/src/print/assignment_pattern_property_list.rs similarity index 100% rename from crates/oxc_formatter/src/write/assignment_pattern_property_list.rs rename to crates/oxc_formatter/src/print/assignment_pattern_property_list.rs diff --git a/crates/oxc_formatter/src/write/binary_like_expression.rs b/crates/oxc_formatter/src/print/binary_like_expression.rs similarity index 100% rename from crates/oxc_formatter/src/write/binary_like_expression.rs rename to crates/oxc_formatter/src/print/binary_like_expression.rs diff --git a/crates/oxc_formatter/src/write/binding_property_list.rs b/crates/oxc_formatter/src/print/binding_property_list.rs similarity index 100% rename from crates/oxc_formatter/src/write/binding_property_list.rs rename to crates/oxc_formatter/src/print/binding_property_list.rs diff --git a/crates/oxc_formatter/src/write/block_statement.rs b/crates/oxc_formatter/src/print/block_statement.rs similarity index 100% rename from crates/oxc_formatter/src/write/block_statement.rs rename to crates/oxc_formatter/src/print/block_statement.rs diff --git a/crates/oxc_formatter/src/write/call_like_expression/arguments.rs b/crates/oxc_formatter/src/print/call_like_expression/arguments.rs similarity index 99% rename from crates/oxc_formatter/src/write/call_like_expression/arguments.rs rename to crates/oxc_formatter/src/print/call_like_expression/arguments.rs index 7515ff39961c5..06a02831cc242 100644 --- a/crates/oxc_formatter/src/write/call_like_expression/arguments.rs +++ b/crates/oxc_formatter/src/print/call_like_expression/arguments.rs @@ -16,12 +16,7 @@ use crate::{ }, trivia::format_dangling_comments, }, - utils::{ - call_expression::is_test_call_expression, is_long_curried_call, - member_chain::simple_argument::SimpleArgument, - }, - write, - write::{ + print::{ FormatFunctionOptions, FormatJsArrowFunctionExpression, FormatJsArrowFunctionExpressionOptions, array_element_list::can_concisely_print_array_list, @@ -32,6 +27,11 @@ use crate::{ function::FormatFunction, parameters::has_only_simple_parameters, }, + utils::{ + call_expression::is_test_call_expression, is_long_curried_call, + member_chain::simple_argument::SimpleArgument, + }, + write, }; impl<'a> Format<'a> for AstNode<'a, ArenaVec<'a, Argument<'a>>> { diff --git a/crates/oxc_formatter/src/write/call_like_expression/mod.rs b/crates/oxc_formatter/src/print/call_like_expression/mod.rs similarity index 98% rename from crates/oxc_formatter/src/write/call_like_expression/mod.rs rename to crates/oxc_formatter/src/print/call_like_expression/mod.rs index ae1dfdabb0878..12923bf6bd0ca 100644 --- a/crates/oxc_formatter/src/write/call_like_expression/mod.rs +++ b/crates/oxc_formatter/src/print/call_like_expression/mod.rs @@ -6,13 +6,13 @@ use oxc_span::GetSpan; use crate::{ ast_nodes::AstNode, formatter::{Formatter, TailwindContextEntry, prelude::*, trivia::FormatTrailingComments}, + print::arrow_function_expression::is_multiline_template_starting_on_same_line, utils::{ call_expression::is_test_call_expression, format_node_without_trailing_comments::FormatNodeWithoutTrailingComments, member_chain::MemberChain, tailwindcss::is_tailwind_function_call, }, write, - write::arrow_function_expression::is_multiline_template_starting_on_same_line, }; use arguments::is_simple_module_import; diff --git a/crates/oxc_formatter/src/write/class.rs b/crates/oxc_formatter/src/print/class.rs similarity index 99% rename from crates/oxc_formatter/src/write/class.rs rename to crates/oxc_formatter/src/print/class.rs index c1769c55e98f4..b8ac4124bc0fc 100644 --- a/crates/oxc_formatter/src/write/class.rs +++ b/crates/oxc_formatter/src/print/class.rs @@ -15,13 +15,13 @@ use crate::{ trivia::{FormatLeadingComments, FormatTrailingComments}, }, parentheses::NeedsParentheses, + print::{function::should_group_function_parameters, semicolon::OptionalSemicolon}, utils::{ assignment_like::AssignmentLike, format_node_without_trailing_comments::FormatNodeWithoutTrailingComments, object::{format_property_key, should_preserve_quote}, }, write, - write::{function::should_group_function_parameters, semicolon::OptionalSemicolon}, }; use super::{ diff --git a/crates/oxc_formatter/src/write/decorators.rs b/crates/oxc_formatter/src/print/decorators.rs similarity index 100% rename from crates/oxc_formatter/src/write/decorators.rs rename to crates/oxc_formatter/src/print/decorators.rs diff --git a/crates/oxc_formatter/src/write/export_declarations.rs b/crates/oxc_formatter/src/print/export_declarations.rs similarity index 99% rename from crates/oxc_formatter/src/write/export_declarations.rs rename to crates/oxc_formatter/src/print/export_declarations.rs index a4eee83069935..d47da7192a232 100644 --- a/crates/oxc_formatter/src/write/export_declarations.rs +++ b/crates/oxc_formatter/src/print/export_declarations.rs @@ -11,11 +11,11 @@ use crate::{ separated::FormatSeparatedIter, trivia::{FormatLeadingComments, FormatTrailingComments}, }, - write, - write::{ + print::{ import_declaration::format_import_and_export_source_with_clause, semicolon::OptionalSemicolon, }, + write, }; use super::FormatWrite; diff --git a/crates/oxc_formatter/src/write/function.rs b/crates/oxc_formatter/src/print/function.rs similarity index 99% rename from crates/oxc_formatter/src/write/function.rs rename to crates/oxc_formatter/src/print/function.rs index 48232fa7321ac..de5f0cf2565af 100644 --- a/crates/oxc_formatter/src/write/function.rs +++ b/crates/oxc_formatter/src/print/function.rs @@ -11,10 +11,10 @@ use crate::{ ast_nodes::AstNode, format_args, formatter::{Buffer, Formatter, prelude::*, trivia::FormatLeadingComments}, - write, - write::{ + print::{ arrow_function_expression::FormatMaybeCachedFunctionBody, semicolon::OptionalSemicolon, }, + write, }; impl<'a> FormatWrite<'a, FormatFunctionOptions> for AstNode<'a, Function<'a>> { diff --git a/crates/oxc_formatter/src/write/function_type.rs b/crates/oxc_formatter/src/print/function_type.rs similarity index 99% rename from crates/oxc_formatter/src/write/function_type.rs rename to crates/oxc_formatter/src/print/function_type.rs index 6be05a164880f..36b1c83de7773 100644 --- a/crates/oxc_formatter/src/write/function_type.rs +++ b/crates/oxc_formatter/src/print/function_type.rs @@ -4,9 +4,9 @@ use crate::{ ast_nodes::AstNode, format_args, formatter::{Formatter, prelude::*}, + print::function::should_group_function_parameters, utils::format_node_without_trailing_comments::FormatNodeWithoutTrailingComments, write, - write::function::should_group_function_parameters, }; use super::FormatWrite; diff --git a/crates/oxc_formatter/src/write/import_declaration.rs b/crates/oxc_formatter/src/print/import_declaration.rs similarity index 99% rename from crates/oxc_formatter/src/write/import_declaration.rs rename to crates/oxc_formatter/src/print/import_declaration.rs index 1d8cf7bba6fdd..14588570165d6 100644 --- a/crates/oxc_formatter/src/write/import_declaration.rs +++ b/crates/oxc_formatter/src/print/import_declaration.rs @@ -9,11 +9,11 @@ use crate::{ formatter::{ Formatter, prelude::*, separated::FormatSeparatedIter, trivia::FormatLeadingComments, }, + print::semicolon::OptionalSemicolon, utils::string::{ FormatLiteralStringToken, StringLiteralParentKind, is_identifier_name_patched, }, write, - write::semicolon::OptionalSemicolon, }; use super::FormatWrite; diff --git a/crates/oxc_formatter/src/write/intersection_type.rs b/crates/oxc_formatter/src/print/intersection_type.rs similarity index 98% rename from crates/oxc_formatter/src/write/intersection_type.rs rename to crates/oxc_formatter/src/print/intersection_type.rs index 2e7ed4144029c..8cf27f12fcffc 100644 --- a/crates/oxc_formatter/src/write/intersection_type.rs +++ b/crates/oxc_formatter/src/print/intersection_type.rs @@ -5,9 +5,9 @@ use oxc_span::GetSpan; use crate::{ ast_nodes::AstNode, formatter::{Formatter, prelude::*}, + print::FormatWrite, utils::typescript::is_object_like_type, write, - write::FormatWrite, }; impl<'a> FormatWrite<'a> for AstNode<'a, TSIntersectionType<'a>> { diff --git a/crates/oxc_formatter/src/write/jsx/child_list.rs b/crates/oxc_formatter/src/print/jsx/child_list.rs similarity index 100% rename from crates/oxc_formatter/src/write/jsx/child_list.rs rename to crates/oxc_formatter/src/print/jsx/child_list.rs diff --git a/crates/oxc_formatter/src/write/jsx/element.rs b/crates/oxc_formatter/src/print/jsx/element.rs similarity index 99% rename from crates/oxc_formatter/src/write/jsx/element.rs rename to crates/oxc_formatter/src/print/jsx/element.rs index 5899434e97c76..c2d5592b00ac1 100644 --- a/crates/oxc_formatter/src/write/jsx/element.rs +++ b/crates/oxc_formatter/src/print/jsx/element.rs @@ -7,12 +7,12 @@ use crate::{ best_fitting, format_args, formatter::{Formatter, prelude::*, trivia::FormatTrailingComments}, parentheses::NeedsParentheses, + print::jsx::{FormatChildrenResult, FormatOpeningElement}, utils::{ jsx::{WrapState, is_meaningful_jsx_text}, suppressed::FormatSuppressedNode, }, write, - write::jsx::{FormatChildrenResult, FormatOpeningElement}, }; use super::{FormatJsxChildList, JsxChildListLayout}; diff --git a/crates/oxc_formatter/src/write/jsx/mod.rs b/crates/oxc_formatter/src/print/jsx/mod.rs similarity index 100% rename from crates/oxc_formatter/src/write/jsx/mod.rs rename to crates/oxc_formatter/src/print/jsx/mod.rs diff --git a/crates/oxc_formatter/src/write/jsx/opening_element.rs b/crates/oxc_formatter/src/print/jsx/opening_element.rs similarity index 100% rename from crates/oxc_formatter/src/write/jsx/opening_element.rs rename to crates/oxc_formatter/src/print/jsx/opening_element.rs diff --git a/crates/oxc_formatter/src/write/mapped_type.rs b/crates/oxc_formatter/src/print/mapped_type.rs similarity index 98% rename from crates/oxc_formatter/src/write/mapped_type.rs rename to crates/oxc_formatter/src/print/mapped_type.rs index baf6a689521e7..673a853f3b201 100644 --- a/crates/oxc_formatter/src/write/mapped_type.rs +++ b/crates/oxc_formatter/src/print/mapped_type.rs @@ -3,9 +3,9 @@ use oxc_ast::ast::{TSMappedType, TSMappedTypeModifierOperator}; use crate::{ ast_nodes::AstNode, formatter::{Formatter, SourceText, prelude::*, trivia::FormatLeadingComments}, + print::semicolon::OptionalSemicolon, utils::suppressed::FormatSuppressedNode, write, - write::semicolon::OptionalSemicolon, }; use super::FormatWrite; diff --git a/crates/oxc_formatter/src/write/member_expression.rs b/crates/oxc_formatter/src/print/member_expression.rs similarity index 100% rename from crates/oxc_formatter/src/write/member_expression.rs rename to crates/oxc_formatter/src/print/member_expression.rs diff --git a/crates/oxc_formatter/src/write/mod.rs b/crates/oxc_formatter/src/print/mod.rs similarity index 99% rename from crates/oxc_formatter/src/write/mod.rs rename to crates/oxc_formatter/src/print/mod.rs index f6a0767922e85..620deee974591 100644 --- a/crates/oxc_formatter/src/write/mod.rs +++ b/crates/oxc_formatter/src/print/mod.rs @@ -60,6 +60,7 @@ use crate::{ }, options::{FormatTrailingCommas, Semicolons, TrailingSeparator}, parentheses::NeedsParentheses, + print::parameters::can_avoid_parentheses, utils::{ array::write_array_node, assignment_like::AssignmentLike, @@ -72,7 +73,6 @@ use crate::{ tailwindcss::write_tailwind_string_literal, }, write, - write::parameters::can_avoid_parentheses, }; use self::{ diff --git a/crates/oxc_formatter/src/write/object_like.rs b/crates/oxc_formatter/src/print/object_like.rs similarity index 98% rename from crates/oxc_formatter/src/write/object_like.rs rename to crates/oxc_formatter/src/print/object_like.rs index 37b079c7abb35..7d4f972d978c8 100644 --- a/crates/oxc_formatter/src/write/object_like.rs +++ b/crates/oxc_formatter/src/print/object_like.rs @@ -9,8 +9,8 @@ use crate::{ trivia::format_dangling_comments, }, options::Expand, + print::parameters::{get_this_param, should_hug_function_parameters}, write, - write::parameters::{get_this_param, should_hug_function_parameters}, }; #[derive(Clone, Copy)] diff --git a/crates/oxc_formatter/src/write/object_pattern_like.rs b/crates/oxc_formatter/src/print/object_pattern_like.rs similarity index 100% rename from crates/oxc_formatter/src/write/object_pattern_like.rs rename to crates/oxc_formatter/src/print/object_pattern_like.rs diff --git a/crates/oxc_formatter/src/write/parameters.rs b/crates/oxc_formatter/src/print/parameters.rs similarity index 100% rename from crates/oxc_formatter/src/write/parameters.rs rename to crates/oxc_formatter/src/print/parameters.rs diff --git a/crates/oxc_formatter/src/write/program.rs b/crates/oxc_formatter/src/print/program.rs similarity index 99% rename from crates/oxc_formatter/src/write/program.rs rename to crates/oxc_formatter/src/print/program.rs index 9a58898a91d5d..8d9c791cd651a 100644 --- a/crates/oxc_formatter/src/write/program.rs +++ b/crates/oxc_formatter/src/print/program.rs @@ -9,9 +9,9 @@ use crate::{ Buffer, Format, ast_nodes::AstNode, formatter::{prelude::*, trivia::FormatTrailingComments}, + print::semicolon::OptionalSemicolon, utils::string::{FormatLiteralStringToken, StringLiteralParentKind}, write, - write::semicolon::OptionalSemicolon, }; use super::FormatWrite; diff --git a/crates/oxc_formatter/src/write/return_or_throw_statement.rs b/crates/oxc_formatter/src/print/return_or_throw_statement.rs similarity index 98% rename from crates/oxc_formatter/src/write/return_or_throw_statement.rs rename to crates/oxc_formatter/src/print/return_or_throw_statement.rs index 76f37d41053b3..a7d8768b5a683 100644 --- a/crates/oxc_formatter/src/write/return_or_throw_statement.rs +++ b/crates/oxc_formatter/src/print/return_or_throw_statement.rs @@ -6,8 +6,8 @@ use crate::{ ast_nodes::{AstNode, AstNodes}, format_args, formatter::{Formatter, prelude::*}, + print::{ExpressionLeftSide, semicolon::OptionalSemicolon}, write, - write::{ExpressionLeftSide, semicolon::OptionalSemicolon}, }; use super::FormatWrite; diff --git a/crates/oxc_formatter/src/write/semicolon.rs b/crates/oxc_formatter/src/print/semicolon.rs similarity index 100% rename from crates/oxc_formatter/src/write/semicolon.rs rename to crates/oxc_formatter/src/print/semicolon.rs diff --git a/crates/oxc_formatter/src/write/sequence_expression.rs b/crates/oxc_formatter/src/print/sequence_expression.rs similarity index 100% rename from crates/oxc_formatter/src/write/sequence_expression.rs rename to crates/oxc_formatter/src/print/sequence_expression.rs diff --git a/crates/oxc_formatter/src/write/switch_statement.rs b/crates/oxc_formatter/src/print/switch_statement.rs similarity index 100% rename from crates/oxc_formatter/src/write/switch_statement.rs rename to crates/oxc_formatter/src/print/switch_statement.rs diff --git a/crates/oxc_formatter/src/write/template.rs b/crates/oxc_formatter/src/print/template.rs similarity index 100% rename from crates/oxc_formatter/src/write/template.rs rename to crates/oxc_formatter/src/print/template.rs diff --git a/crates/oxc_formatter/src/write/try_statement.rs b/crates/oxc_formatter/src/print/try_statement.rs similarity index 100% rename from crates/oxc_formatter/src/write/try_statement.rs rename to crates/oxc_formatter/src/print/try_statement.rs diff --git a/crates/oxc_formatter/src/write/tuple_type.rs b/crates/oxc_formatter/src/print/tuple_type.rs similarity index 100% rename from crates/oxc_formatter/src/write/tuple_type.rs rename to crates/oxc_formatter/src/print/tuple_type.rs diff --git a/crates/oxc_formatter/src/write/type_parameters.rs b/crates/oxc_formatter/src/print/type_parameters.rs similarity index 100% rename from crates/oxc_formatter/src/write/type_parameters.rs rename to crates/oxc_formatter/src/print/type_parameters.rs diff --git a/crates/oxc_formatter/src/write/union_type.rs b/crates/oxc_formatter/src/print/union_type.rs similarity index 99% rename from crates/oxc_formatter/src/write/union_type.rs rename to crates/oxc_formatter/src/print/union_type.rs index 8f88e7965b734..c828840537309 100644 --- a/crates/oxc_formatter/src/write/union_type.rs +++ b/crates/oxc_formatter/src/print/union_type.rs @@ -11,9 +11,9 @@ use crate::{ trivia::{FormatLeadingComments, FormatTrailingComments}, }, parentheses::NeedsParentheses, + print::FormatWrite, utils::{suppressed::FormatSuppressedNode, typescript::should_hug_type}, write, - write::FormatWrite, }; impl<'a> FormatWrite<'a> for AstNode<'a, TSUnionType<'a>> { diff --git a/crates/oxc_formatter/src/write/variable_declaration.rs b/crates/oxc_formatter/src/print/variable_declaration.rs similarity index 98% rename from crates/oxc_formatter/src/write/variable_declaration.rs rename to crates/oxc_formatter/src/print/variable_declaration.rs index bdd6c51a4a11f..3d02d0a033c74 100644 --- a/crates/oxc_formatter/src/write/variable_declaration.rs +++ b/crates/oxc_formatter/src/print/variable_declaration.rs @@ -2,8 +2,8 @@ use oxc_allocator::Vec; use oxc_ast::ast::*; use oxc_span::GetSpan; +use crate::print::semicolon::OptionalSemicolon; use crate::utils::assignment_like::AssignmentLike; -use crate::write::semicolon::OptionalSemicolon; use crate::{ ast_nodes::{AstNode, AstNodes}, format_args, diff --git a/crates/oxc_formatter/src/utils/assignment_like.rs b/crates/oxc_formatter/src/utils/assignment_like.rs index baa0ab07a3a42..50988d7d2d0f7 100644 --- a/crates/oxc_formatter/src/utils/assignment_like.rs +++ b/crates/oxc_formatter/src/utils/assignment_like.rs @@ -8,13 +8,13 @@ use crate::{ prelude::{FormatElements, format_once, line_suffix_boundary, *}, trivia::FormatTrailingComments, }, + print::{BinaryLikeExpression, FormatJsArrowFunctionExpressionOptions, FormatWrite}, utils::{ format_node_without_trailing_comments::FormatNodeWithoutTrailingComments, member_chain::is_member_call_chain, object::{format_property_key, write_member_name}, }, write, - write::{BinaryLikeExpression, FormatJsArrowFunctionExpressionOptions, FormatWrite}, }; use super::string::{FormatLiteralStringToken, StringLiteralParentKind}; diff --git a/crates/oxc_formatter/src/utils/statement_body.rs b/crates/oxc_formatter/src/utils/statement_body.rs index 5c6043dc1cc27..256647b09b382 100644 --- a/crates/oxc_formatter/src/utils/statement_body.rs +++ b/crates/oxc_formatter/src/utils/statement_body.rs @@ -8,9 +8,9 @@ use crate::{ prelude::{format_once, soft_line_indent_or_space, space}, trivia::FormatTrailingComments, }, + print::FormatWrite, utils::format_node_without_trailing_comments::FormatNodeWithoutTrailingComments, write, - write::FormatWrite, }; pub struct FormatStatementBody<'a, 'b> { diff --git a/tasks/ast_tools/src/generators/formatter/format.rs b/tasks/ast_tools/src/generators/formatter/format.rs index ef0a25e239aab..2b78b51677d3a 100644 --- a/tasks/ast_tools/src/generators/formatter/format.rs +++ b/tasks/ast_tools/src/generators/formatter/format.rs @@ -90,7 +90,7 @@ impl Generator for FormatterFormatGenerator { parentheses::NeedsParentheses, ast_nodes::AstNode, utils::{suppressed::FormatSuppressedNode, typecast::format_type_cast_comment_node}, - write::{FormatWrite #(#options)*}, + print::{FormatWrite #(#options)*}, }; #impls