feat: add catchClause.spaceAround (#608)

Author: Thristhart

deployment/schema.json

@@ -868,6 +868,9 @@
     "arrayPattern.spaceAround": {
       "$ref": "#/definitions/spaceAround"
     },
+    "catchClause.spaceAround": {
+      "$ref": "#/definitions/spaceAround"
+    },
     "doWhileStatement.spaceAround": {
       "$ref": "#/definitions/spaceAround"
     },

src/configuration/builder.rs

@@ -1008,6 +1008,10 @@ impl ConfigurationBuilder {
     self.insert("arrayPattern.spaceAround", value.into())
   }
 
+  pub fn catch_clause_space_around(&mut self, value: bool) -> &mut Self {
+    self.insert("catchClause.spaceAround", value.into())
+  }
+
   pub fn do_while_statement_space_around(&mut self, value: bool) -> &mut Self {
     self.insert("doWhileStatement.spaceAround", value.into())
   }
@@ -1252,6 +1256,7 @@ mod tests {
       .arguments_space_around(true)
       .array_expression_space_around(true)
       .array_pattern_space_around(true)
+      .catch_clause_space_around(true)
       .do_while_statement_space_around(true)
       .for_in_statement_space_around(true)
       .for_of_statement_space_around(true)
@@ -1264,7 +1269,7 @@ mod tests {
       .while_statement_space_around(true);
 
     let inner_config = config.get_inner_config();
-    assert_eq!(inner_config.len(), 178);
+    assert_eq!(inner_config.len(), 179);
     let diagnostics = resolve_config(inner_config, &Default::default()).diagnostics;
     assert_eq!(diagnostics.len(), 0);
   }

src/configuration/resolve_config.rs

@@ -309,6 +309,7 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
     arguments_space_around: get_value(&mut config, "arguments.spaceAround", space_around, &mut diagnostics),
     array_expression_space_around: get_value(&mut config, "arrayExpression.spaceAround", space_around, &mut diagnostics),
     array_pattern_space_around: get_value(&mut config, "arrayPattern.spaceAround", space_around, &mut diagnostics),
+    catch_clause_space_around: get_value(&mut config, "catchClause.spaceAround", space_around, &mut diagnostics),
     do_while_statement_space_around: get_value(&mut config, "doWhileStatement.spaceAround", space_around, &mut diagnostics),
     for_in_statement_space_around: get_value(&mut config, "forInStatement.spaceAround", space_around, &mut diagnostics),
     for_of_statement_space_around: get_value(&mut config, "forOfStatement.spaceAround", space_around, &mut diagnostics),

src/configuration/types.rs

@@ -610,6 +610,8 @@ pub struct Configuration {
   pub array_expression_space_around: bool,
   #[serde(rename = "arrayPattern.spaceAround")]
   pub array_pattern_space_around: bool,
+  #[serde(rename = "catchClause.spaceAround")]
+  pub catch_clause_space_around: bool,
   #[serde(rename = "doWhileStatement.spaceAround")]
   pub do_while_statement_space_around: bool,
   #[serde(rename = "forInStatement.spaceAround")]

src/generation/generate.rs

@@ -722,7 +722,13 @@ fn gen_catch_clause<'a>(node: &CatchClause<'a>, context: &mut Context<'a>) -> Pr
 
   if let Some(param) = &node.param {
     items.push_str(" (");
+    if context.config.catch_clause_space_around {
+      items.push_str(" ");
+    }
     items.extend(gen_node(param.into(), context));
+    if context.config.catch_clause_space_around {
+      items.push_str(" ");
+    }
     items.push_str(")");
   }
   items.push_info(end_header_ln);

tests/specs/clauses/catchClause/CatchClause_SpaceAround_True.txt

@@ -0,0 +1,42 @@
+~~ catchClause.spaceAround: true ~~
+== should output without param ==
+try{
+    a;
+} catch
+{
+    b;
+}
+
+[expect]
+try {
+    a;
+} catch {
+    b;
+}
+
+== should output with param ==
+try{
+    a;
+}
+catch(ex){
+    b;
+}
+
+[expect]
+try {
+    a;
+} catch ( ex ) {
+    b;
+}
+
+== should output with type on param ==
+try {
+    a
+} catch (  ex    :unknown ) {
+}
+
+[expect]
+try {
+    a;
+} catch ( ex: unknown ) {
+}