fix(js_parser): allow a trailing comma in setters (#4324)

biomejs · Oct 22, 2024 · d621498 · d621498
1 parent edd82c0
commit d621498
Show file tree

Hide file tree

Showing 43 changed files with 1,260 additions and 509 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,14 +74,18 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 ### Parser
 
-#### New features
-
-- Add support for parsing the defer attribute in import statements ([#4215](https://github.com/biomejs/biome/issues/4215)).
+#### Bug fixes
 
-   ```js
-   import defer * as myModule from "my-module";
-   ```
+- Fix [#4317](https://github.com/biomejs/biome/issues/4317), setter parameter can contain a trailing comma, the following example will now parsed correctly:
 
+  ```js
+  export class DummyClass {
+    set input(
+      value: string,
+    ) {}
+  }
+  ```
+
   Contributed by @fireairforce
 
 ## v1.9.4 (2024-10-17)

diff --git a/crates/biome_grit_patterns/src/grit_target_language/js_target_language/constants.rs b/crates/biome_grit_patterns/src/grit_target_language/js_target_language/constants.rs
diff --git a/crates/biome_js_factory/src/generated/node_factory.rs b/crates/biome_js_factory/src/generated/node_factory.rs
diff --git a/crates/biome_js_factory/src/generated/syntax_factory.rs b/crates/biome_js_factory/src/generated/syntax_factory.rs
diff --git a/crates/biome_js_formatter/src/js/classes/setter_class_member.rs b/crates/biome_js_formatter/src/js/classes/setter_class_member.rs
@@ -15,6 +15,7 @@ impl FormatNodeRule<JsSetterClassMember> for FormatJsSetterClassMember {
             name,
             l_paren_token,
             parameter,
+            comma_token,
             r_paren_token,
             body,
         } = node.as_fields();
@@ -29,6 +30,7 @@ impl FormatNodeRule<JsSetterClassMember> for FormatJsSetterClassMember {
                 name.format(),
                 l_paren_token.format(),
                 parameter.format(),
+                comma_token.format(),
                 r_paren_token.format(),
                 space(),
                 body.format(),

diff --git a/crates/biome_js_formatter/src/js/objects/setter_object_member.rs b/crates/biome_js_formatter/src/js/objects/setter_object_member.rs
@@ -14,6 +14,7 @@ impl FormatNodeRule<JsSetterObjectMember> for FormatJsSetterObjectMember {
             name,
             l_paren_token,
             parameter,
+            comma_token,
             r_paren_token,
             body,
         } = node.as_fields();
@@ -26,6 +27,7 @@ impl FormatNodeRule<JsSetterObjectMember> for FormatJsSetterObjectMember {
                 name.format(),
                 l_paren_token.format(),
                 parameter.format(),
+                comma_token.format(),
                 r_paren_token.format(),
                 space(),
                 body.format(),

diff --git a/crates/biome_js_formatter/src/ts/auxiliary/setter_signature_type_member.rs b/crates/biome_js_formatter/src/ts/auxiliary/setter_signature_type_member.rs
@@ -18,6 +18,7 @@ impl FormatNodeRule<TsSetterSignatureTypeMember> for FormatTsSetterSignatureType
             name,
             l_paren_token,
             parameter,
+            comma_token,
             r_paren_token,
             separator_token,
         } = node.as_fields();
@@ -30,6 +31,7 @@ impl FormatNodeRule<TsSetterSignatureTypeMember> for FormatTsSetterSignatureType
                 name.format(),
                 l_paren_token.format(),
                 parameter.format(),
+                comma_token.format(),
                 r_paren_token.format(),
                 FormatTypeMemberSeparator::new(separator_token.as_ref())
             ]

diff --git a/crates/biome_js_formatter/src/ts/classes/setter_signature_class_member.rs b/crates/biome_js_formatter/src/ts/classes/setter_signature_class_member.rs
@@ -19,6 +19,7 @@ impl FormatNodeRule<TsSetterSignatureClassMember> for FormatTsSetterSignatureCla
             name,
             l_paren_token,
             parameter,
+            comma_token,
             r_paren_token,
             semicolon_token,
         } = node.as_fields();
@@ -33,6 +34,7 @@ impl FormatNodeRule<TsSetterSignatureClassMember> for FormatTsSetterSignatureCla
                 name.format(),
                 l_paren_token.format(),
                 parameter.format(),
+                comma_token.format(),
                 r_paren_token.format(),
                 FormatOptionalSemicolon::new(semicolon_token.as_ref())
             ]

diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js b/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js
@@ -3,4 +3,5 @@ let a = {
 }
 let b = {
 	set foo(a) {}
+	set bar(a, ) {}
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js.snap
@@ -10,6 +10,7 @@ let a = {
 }
 let b = {
 	set foo(a) {}
+	set bar(a, ) {}
 }
 
 ```
@@ -42,6 +43,7 @@ let a = {
 	get foo() {},
 };
 let b = {
-	set foo(a) {},
-};
+	set foo(a) {}
+	set bar(a, ) {}
+}
 ```