rebase and fix indent

rome · Jan 31, 2022 · 899ec72 · 899ec72
1 parent b92f2a1
commit 899ec72
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/crates/rome_formatter/src/cst.rs b/crates/rome_formatter/src/cst.rs
@@ -4,17 +4,20 @@ use rslint_parser::ast::{
     JsBlockStatement, JsBooleanLiteralExpression, JsCallArguments, JsCallExpression, JsCaseClause,
     JsCatchClause, JsClassStatement, JsConstructorParameters, JsContinueStatement,
     JsDebuggerStatement, JsDefaultClause, JsDefaultImportSpecifier, JsDoWhileStatement,
-    JsEmptyStatement, JsExportDefaultExpressionClause, JsExportDefaultFunctionClause,
-    JsExportFunctionClause, JsExportVariableClause, JsExpressionStatement, JsFinallyClause,
-    JsForInStatement, JsForStatement, JsFunctionStatement, JsGetterClassMember,
-    JsIdentifierBinding, JsIdentifierExpression, JsIfStatement, JsImportAssertion,
-    JsImportAssertionEntry, JsImportBareClause, JsImportCallExpression, JsImportDefaultClause,
-    JsImportNamedClause, JsImportNamespaceClause, JsLabeledStatement, JsLiteralExportName,
-    JsModule, JsModuleSource, JsNamedImportSpecifier, JsNamedImportSpecifiers,
-    JsNamespaceImportSpecifier, JsNullLiteralExpression, JsNumberLiteralExpression,
-    JsObjectExpression, JsParameters, JsPropertyClassMember, JsPropertyObjectMember,
-    JsReturnStatement, JsScript, JsSequenceExpression, JsSetterClassMember,
-    JsShorthandNamedImportSpecifier, JsShorthandPropertyObjectMember, JsSpread, JsStatementList,
+    JsEmptyStatement, JsExport, JsExportAsClause, JsExportClassClause, JsExportDefaultClassClause,
+    JsExportDefaultExpressionClause, JsExportDefaultFunctionClause, JsExportFromClause,
+    JsExportFunctionClause, JsExportNamedClause, JsExportNamedFromClause,
+    JsExportNamedFromSpecifier, JsExportNamedShorthandSpecifier, JsExportNamedSpecifier,
+    JsExportVariableClause, JsExpressionStatement, JsFinallyClause, JsForInStatement,
+    JsForStatement, JsFunctionStatement, JsGetterClassMember, JsIdentifierBinding,
+    JsIdentifierExpression, JsIfStatement, JsImportAssertion, JsImportAssertionEntry,
+    JsImportBareClause, JsImportCallExpression, JsImportDefaultClause, JsImportNamedClause,
+    JsImportNamespaceClause, JsLabeledStatement, JsLiteralExportName, JsModule, JsModuleSource,
+    JsNamedImportSpecifier, JsNamedImportSpecifiers, JsNamespaceImportSpecifier,
+    JsNullLiteralExpression, JsNumberLiteralExpression, JsObjectExpression, JsParameters,
+    JsPropertyClassMember, JsPropertyObjectMember, JsReturnStatement, JsScript,
+    JsSequenceExpression, JsSetterClassMember, JsShorthandNamedImportSpecifier,
+    JsShorthandPropertyObjectMember, JsSpread, JsStatementList,
     JsStaticInitializationBlockClassMember, JsStringLiteralExpression, JsSwitchStatement,
     JsTemplate, JsTemplateChunkElement, JsTemplateElement, JsTryStatement, JsUnknownAssignment,
     JsUnknownBinding, JsUnknownExpression, JsUnknownImportAssertionEntry, JsUnknownMember,

diff --git a/crates/rome_formatter/src/ts/export/named_clause.rs b/crates/rome_formatter/src/ts/export/named_clause.rs
@@ -1,6 +1,6 @@
 use crate::{
     empty_element, format_elements, group_elements, if_group_fits_on_single_line, join_elements,
-    soft_indent, soft_line_break_or_space, space_token, token, FormatElement, FormatResult,
+    soft_block_indent, soft_line_break_or_space, space_token, token, FormatElement, FormatResult,
     Formatter, ToFormatElement,
 };
 use rslint_parser::ast::JsExportNamedClause;
@@ -19,7 +19,7 @@ impl ToFormatElement for JsExportNamedClause {
             |leading, trailing| {
                 Ok(format_elements!(
                     space.clone(),
-                    soft_indent(format_elements![
+                    soft_block_indent(format_elements![
                         leading,
                         join_elements(
                             soft_line_break_or_space(),

diff --git a/crates/rome_formatter/src/ts/export/named_from_clause.rs b/crates/rome_formatter/src/ts/export/named_from_clause.rs
@@ -1,6 +1,6 @@
 use crate::{
     empty_element, format_elements, group_elements, if_group_fits_on_single_line, join_elements,
-    soft_indent, soft_line_break_or_space, space_token, token, FormatElement, FormatResult,
+    soft_block_indent, soft_line_break_or_space, space_token, token, FormatElement, FormatResult,
     Formatter, ToFormatElement,
 };
 use rslint_parser::ast::JsExportNamedFromClause;
@@ -19,7 +19,7 @@ impl ToFormatElement for JsExportNamedFromClause {
             |leading, trailing| {
                 Ok(format_elements!(
                     space.clone(),
-                    soft_indent(format_elements![
+                    soft_block_indent(format_elements![
                         leading,
                         join_elements(
                             soft_line_break_or_space(),