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

feat(rome_js_parser): Implement the decorator parsing via the option #4598

Merged
merged 2 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"const doSomething = () => { if (test) { var foo = 42; } }",
"class C { constructor() { if(test) { var foo; } } }",
"class C { get x() { if(test) { var foo; } } }",
"class C { set x() { if(test) { var foo; } } }",
"class C { set x(value) { if(test) { var foo; } } }",
"class C { method() { if(test) { var foo; } } }",
"class C { static { if (test) { function foo() {} } } }",
"class C { static { if (test) { var foo; } } }",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/rome_js_analyze/tests/spec_tests.rs
assertion_line: 96
expression: invalid.jsonc
---
# Input
Expand Down Expand Up @@ -433,17 +432,17 @@ invalid.jsonc:1:32 lint/correctness/noInnerDeclarations ━━━━━━━━

# Input
```js
class C { set x() { if(test) { var foo; } } }
class C { set x(value) { if(test) { var foo; } } }
```

# Diagnostics
```
invalid.jsonc:1:32 lint/correctness/noInnerDeclarations ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
invalid.jsonc:1:37 lint/correctness/noInnerDeclarations ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

! This var should be declared at the root of the enclosing function.

> 1 │ class C { set x() { if(test) { var foo; } } }
│ ^^^^^^^
> 1 │ class C { set x(value) { if(test) { var foo; } } }
^^^^^^^

i The var is accessible in the whole body of the enclosing function.
To avoid confusion, it should be declared at the root of the enclosing function.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class A { foo() {} 'foo'() {} }
class A { static constructor() {} static 'constructor'() {} }
class A { foo; accessor foo; }
class A { get foo () {} accessor foo; }
class A { set foo () {} accessor foo; }
class A { set foo (value) {} accessor foo; }
class A { foo() {} foo() {} bar() {} bar() {} }
class A { get foo() {} get foo() {} }
class A { foo() {} "foo"() {} }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/rome_js_analyze/tests/spec_tests.rs
assertion_line: 96
expression: invalid.js
---
# Input
Expand All @@ -17,7 +16,7 @@ class A { foo() {} 'foo'() {} }
class A { static constructor() {} static 'constructor'() {} }
class A { foo; accessor foo; }
class A { get foo () {} accessor foo; }
class A { set foo () {} accessor foo; }
class A { set foo (value) {} accessor foo; }
class A { foo() {} foo() {} bar() {} bar() {} }
class A { get foo() {} get foo() {} }
class A { foo() {} "foo"() {} }
Expand Down Expand Up @@ -199,7 +198,7 @@ invalid.js:11:16 lint/suspicious/noDuplicateClassMembers ━━━━━━━
> 11 │ class A { foo; accessor foo; }
│ ^^^^^^^^^^^^^
12 │ class A { get foo () {} accessor foo; }
13 │ class A { set foo () {} accessor foo; }
13 │ class A { set foo (value) {} accessor foo; }


```
Expand All @@ -213,21 +212,21 @@ invalid.js:12:25 lint/suspicious/noDuplicateClassMembers ━━━━━━━
11 │ class A { foo; accessor foo; }
> 12 │ class A { get foo () {} accessor foo; }
│ ^^^^^^^^^^^^^
13 │ class A { set foo () {} accessor foo; }
13 │ class A { set foo (value) {} accessor foo; }
14 │ class A { foo() {} foo() {} bar() {} bar() {} }


```

```
invalid.js:13:25 lint/suspicious/noDuplicateClassMembers ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
invalid.js:13:30 lint/suspicious/noDuplicateClassMembers ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

! Duplicate class member name "foo"

11 │ class A { foo; accessor foo; }
12 │ class A { get foo () {} accessor foo; }
> 13 │ class A { set foo () {} accessor foo; }
│ ^^^^^^^^^^^^^
> 13 │ class A { set foo (value) {} accessor foo; }
^^^^^^^^^^^^^
14 │ class A { foo() {} foo() {} bar() {} bar() {} }
15 │ class A { get foo() {} get foo() {} }

Expand All @@ -240,7 +239,7 @@ invalid.js:14:20 lint/suspicious/noDuplicateClassMembers ━━━━━━━
! Duplicate class member name "foo"

12 │ class A { get foo () {} accessor foo; }
13 │ class A { set foo () {} accessor foo; }
13 │ class A { set foo (value) {} accessor foo; }
> 14 │ class A { foo() {} foo() {} bar() {} bar() {} }
│ ^^^^^^^^
15 │ class A { get foo() {} get foo() {} }
Expand All @@ -255,7 +254,7 @@ invalid.js:14:38 lint/suspicious/noDuplicateClassMembers ━━━━━━━
! Duplicate class member name "bar"

12 │ class A { get foo () {} accessor foo; }
13 │ class A { set foo () {} accessor foo; }
13 │ class A { set foo (value) {} accessor foo; }
> 14 │ class A { foo() {} foo() {} bar() {} bar() {} }
│ ^^^^^^^^
15 │ class A { get foo() {} get foo() {} }
Expand All @@ -269,7 +268,7 @@ invalid.js:15:24 lint/suspicious/noDuplicateClassMembers ━━━━━━━

! Duplicate class member name "foo"

13 │ class A { set foo () {} accessor foo; }
13 │ class A { set foo (value) {} accessor foo; }
14 │ class A { foo() {} foo() {} bar() {} bar() {} }
> 15 │ class A { get foo() {} get foo() {} }
│ ^^^^^^^^^^^^
Expand Down
14 changes: 13 additions & 1 deletion crates/rome_js_factory/src/generated/node_factory.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 24 additions & 3 deletions crates/rome_js_factory/src/generated/syntax_factory.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions crates/rome_js_formatter/src/js/bindings/formal_parameter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub(crate) struct FormatJsFormalParameter;
impl FormatNodeRule<JsFormalParameter> for FormatJsFormalParameter {
fn fmt_fields(&self, node: &JsFormalParameter, f: &mut JsFormatter) -> FormatResult<()> {
let JsFormalParameterFields {
decorators,
binding,
question_mark_token,
type_annotation,
Expand All @@ -23,6 +24,7 @@ impl FormatNodeRule<JsFormalParameter> for FormatJsFormalParameter {
write![
f,
[
decorators.format(),
binding.format(),
question_mark_token.format(),
type_annotation.format()
Expand Down
2 changes: 2 additions & 0 deletions crates/rome_js_formatter/src/js/bindings/rest_parameter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub(crate) struct FormatJsRestParameter;
impl FormatNodeRule<JsRestParameter> for FormatJsRestParameter {
fn fmt_fields(&self, node: &JsRestParameter, f: &mut JsFormatter) -> FormatResult<()> {
let JsRestParameterFields {
decorators,
dotdotdot_token,
binding,
type_annotation,
Expand All @@ -18,6 +19,7 @@ impl FormatNodeRule<JsRestParameter> for FormatJsRestParameter {
write![
f,
[
decorators.format(),
dotdotdot_token.format(),
binding.format(),
type_annotation.format(),
Expand Down
11 changes: 10 additions & 1 deletion crates/rome_js_formatter/src/ts/bindings/property_parameter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,19 @@ pub struct FormatTsPropertyParameter;
impl FormatNodeRule<TsPropertyParameter> for FormatTsPropertyParameter {
fn fmt_fields(&self, node: &TsPropertyParameter, f: &mut JsFormatter) -> FormatResult<()> {
let TsPropertyParameterFields {
decorators,
modifiers,
formal_parameter,
} = node.as_fields();

write![f, [modifiers.format(), space(), formal_parameter.format()]]
write![
f,
[
decorators.format(),
modifiers.format(),
space(),
formal_parameter.format()
]
]
}
}
9 changes: 3 additions & 6 deletions crates/rome_js_formatter/tests/quick_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ mod language {
// use this test check if your snippet prints as you wish, without using a snapshot
fn quick_test() {
let src = r#"
(
<div
attr=''
atrr={''}
/>
)
class A { constructor(private x, protected y, public z) {} }
class B { constructor(readonly w, private readonly x, protected readonly y, public readonly z) {} }
class C { constructor(private x: string, readonly y?, z = "default", ...rest) {} }
"#;
let syntax = JsFileSource::tsx();
let tree = parse(src, syntax, JsParserOptions::default());
Expand Down
Loading