Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.

Commit

Permalink
test: bare import tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ematipico committed Jan 24, 2022
1 parent cbf1cb6 commit 223b194
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 26 deletions.
4 changes: 0 additions & 4 deletions crates/rome_formatter/src/cst.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use crate::{FormatElement, FormatResult, Formatter, ToFormatElement};
use rslint_parser::ast::JsAnyNamedImportSpecifier::JsNamedImportSpecifier;
use rslint_parser::ast::{
JsArrayBindingPattern, JsArrayExpression, JsArrowFunctionExpression, JsBlockStatement,
JsBooleanLiteralExpression, JsCallArguments, JsCallExpression, JsCaseClause, JsCatchClause,
Expand Down Expand Up @@ -206,9 +205,6 @@ impl ToFormatElement for SyntaxNode {
.unwrap()
.to_format_element(formatter)
}
JsSyntaxKind::JS_MODULE => JsModule::cast(self.clone())
.unwrap()
.to_format_element(formatter),
JsSyntaxKind::JS_IMPORT_BARE_CLAUSE => JsImportBareClause::cast(self.clone())
.unwrap()
.to_format_element(formatter),
Expand Down
4 changes: 2 additions & 2 deletions crates/rome_formatter/src/ts/import/bare_clause.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ impl ToFormatElement for JsImportBareClause {
fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
let source = formatter.format_node(self.source()?)?;
let assertion = if let Some(assertion) = self.assertion() {
formatter.format_node(assertion)?
format_elements![space_token(), formatter.format_node(assertion)?]
} else {
empty_element()
};

Ok(format_elements![source, space_token(), assertion])
Ok(format_elements![source, assertion])
}
}
6 changes: 2 additions & 4 deletions crates/rome_formatter/src/ts/root/any_module_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ use rslint_parser::ast::JsAnyModuleItem;
impl ToFormatElement for JsAnyModuleItem {
fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
match self {
JsAnyModuleItem::JsAnyStatement(any_statement) => {
any_statement.to_format_element(formatter)
}
JsAnyModuleItem::JsAnyStatement(statement) => statement.to_format_element(formatter),
JsAnyModuleItem::JsExport(_) => todo!(),
JsAnyModuleItem::JsImport(_) => todo!(),
JsAnyModuleItem::JsImport(import) => import.to_format_element(formatter),
}
}
}
12 changes: 0 additions & 12 deletions crates/rome_formatter/src/ts/root/module_item.rs

This file was deleted.

4 changes: 2 additions & 2 deletions crates/rome_formatter/tests/spec_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ mod formatter {

mod js_module {
use crate::spec_test;
tests_macros::gen_tests! {"tests/specs/js/module/**.js", spec_test::run, "module"}
tests_macros::gen_tests! {"tests/specs/js/module/**/*.js", spec_test::run, "module"}
}

mod js_script {
use crate::spec_test;
tests_macros::gen_tests! {"tests/specs/js/script/**.js", spec_test::run, "script"}
tests_macros::gen_tests! {"tests/specs/js/script/**/*.js", spec_test::run, "script"}
}
}
2 changes: 0 additions & 2 deletions crates/rome_formatter/tests/specs/js/import/named_import.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_";
import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long" assert { type : "json"}
import "very_long_import_very_long_import_very" assert {
// something good is here
"type": /****/ "json"
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
source: crates/rome_formatter/tests/spec_test.rs
assertion_line: 63
expression: bare_import.js

---
# Input
import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_";
import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long" assert { type : "json"}
import "very_long_import_very_long_import_very" assert {
// something good is here
"type": /****/ "json"
}


---
# Output
import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_";
import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long" assert {
type: "json"
};
import "very_long_import_very_long_import_very" assert {
// something good is here
"type": "json" /****/
};

0 comments on commit 223b194

Please sign in to comment.