rebase and fix issues

rome · Jan 31, 2022 · 9f51206 · 9f51206
1 parent e99a695
commit 9f51206
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/crates/rome_formatter/src/cst.rs b/crates/rome_formatter/src/cst.rs
@@ -1,4 +1,4 @@
-use crate::{ts::format_statements, FormatElement, FormatResult, Formatter, ToFormatElement};
+use crate::{FormatElement, FormatResult, Formatter, ToFormatElement};
 use rslint_parser::ast::{
     JsArrayBindingPattern, JsArrayExpression, JsArrowFunctionExpression, JsBlockStatement,
     JsBooleanLiteralExpression, JsCallArguments, JsCallExpression, JsCaseClause, JsCatchClause,
@@ -221,10 +221,9 @@ impl ToFormatElement for SyntaxNode {
                 .unwrap()
                 .to_format_element(formatter),
 
-            JsSyntaxKind::JS_STATEMENT_LIST => Ok(format_statements(
-                JsStatementList::cast(self.clone()).unwrap(),
-                formatter,
-            )),
+            JsSyntaxKind::JS_STATEMENT_LIST => {
+                Ok(formatter.format_list(JsStatementList::cast(self.clone()).unwrap()))
+            }
             JsSyntaxKind::JS_VARIABLE_DECLARATIONS => JsVariableDeclarations::cast(self.clone())
                 .unwrap()
                 .to_format_element(formatter),

diff --git a/crates/rome_formatter/src/ts/import/mod.rs b/crates/rome_formatter/src/ts/import/mod.rs
@@ -28,7 +28,7 @@ impl ToFormatElement for JsImport {
         let import_clause = formatter.format_node(&self.import_clause()?)?;
         let semicolon = formatter
             .format_token(&self.semicolon_token())?
-            .unwrap_or_else(|| token(';'));
+            .unwrap_or_else(|| token(";"));
 
         Ok(format_elements![
             import_token,

diff --git a/crates/rome_formatter/src/ts/mod.rs b/crates/rome_formatter/src/ts/mod.rs
@@ -15,8 +15,6 @@ mod statements;
 mod template;
 mod unknown;
 
-pub(crate) use statements::format_statements;
-
 #[cfg(test)]
 mod test {
     use rslint_parser::parse_script;