refactor(formatter): organize utils structure (#14710)

merge two util modules

Author: Dunqing

crates/oxc_formatter/src/write/utils/array.rs renamed to crates/oxc_formatter/src/utils/array.rs

@@ -1,3 +1,4 @@
+pub mod array;
 pub mod assignment_like;
 pub mod call_expression;
 pub mod conditional;
@@ -6,6 +7,7 @@ pub mod format_node_without_trailing_comments;
 pub mod jsx;
 pub mod member_chain;
 pub mod object;
+pub mod statement_body;
 pub mod string_utils;
 pub mod suppressed;
 pub mod typecast;

crates/oxc_formatter/src/utils/mod.rs

@@ -9,11 +9,10 @@ use crate::{
         Buffer, Comments, Format, FormatResult, Formatter, GroupId, prelude::*,
         separated::FormatSeparatedIter,
     },
+    utils::array::write_array_node,
     write,
 };
 
-use super::utils::array::write_array_node;
-
 pub struct ArrayElementList<'a, 'b> {
     elements: &'b AstNode<'a, Vec<'a, ArrayExpressionElement<'a>>>,
     group_id: Option<GroupId>,

crates/oxc_formatter/src/write/utils/statement_body.rs renamed to crates/oxc_formatter/src/utils/statement_body.rs

@@ -7,9 +7,11 @@ use crate::{
     Format, FormatResult,
     ast_nodes::{AstNode, AstNodes},
     formatter::{Formatter, prelude::*, trivia::format_dangling_comments},
-    utils::format_node_without_trailing_comments::FormatNodeWithoutTrailingComments,
+    utils::{
+        array::write_array_node,
+        format_node_without_trailing_comments::FormatNodeWithoutTrailingComments,
+    },
     write,
-    write::utils::array::write_array_node,
 };
 
 use super::FormatWrite;

crates/oxc_formatter/src/write/array_element_list.rs

@@ -31,7 +31,6 @@ mod try_statement;
 mod tuple_type;
 mod type_parameters;
 mod union_type;
-mod utils;
 mod variable_declaration;
 
 pub use arrow_function_expression::{
@@ -64,13 +63,15 @@ use crate::{
     options::{FormatTrailingCommas, QuoteProperties, Semicolons, TrailingSeparator},
     parentheses::NeedsParentheses,
     utils::{
+        array::write_array_node,
         assignment_like::AssignmentLike,
         call_expression::{contains_a_test_pattern, is_test_call_expression, is_test_each_pattern},
         conditional::ConditionalLike,
         expression::ExpressionLeftSide,
         format_node_without_trailing_comments::FormatNodeWithoutTrailingComments,
         member_chain::MemberChain,
         object::format_property_key,
+        statement_body::FormatStatementBody,
         string_utils::{FormatLiteralStringToken, StringLiteralParentKind},
         suppressed::FormatSuppressedNode,
     },
@@ -89,10 +90,6 @@ use self::{
     return_or_throw_statement::FormatAdjacentArgument,
     semicolon::OptionalSemicolon,
     type_parameters::{FormatTSTypeParameters, FormatTSTypeParametersOptions},
-    utils::{
-        array::{TrailingSeparatorMode, write_array_node},
-        statement_body::FormatStatementBody,
-    },
 };
 
 pub trait FormatWrite<'ast, T = ()> {

crates/oxc_formatter/src/write/array_pattern.rs

@@ -12,8 +12,9 @@ use crate::{
         prelude::*,
         trivia::{DanglingIndentMode, FormatDanglingComments, FormatTrailingComments},
     },
+    utils::statement_body::FormatStatementBody,
     write,
-    write::{semicolon::OptionalSemicolon, utils::statement_body::FormatStatementBody},
+    write::semicolon::OptionalSemicolon,
 };
 
 use super::FormatWrite;