feat: rename jsxElement.spaceBeforeSelfClosingTagSlash to jsx.spaceBeforeSelfClosingTagSlash

Author: dsherret

deployment/schema.json

@@ -633,7 +633,7 @@
         "description": "Ex. `import {SomeExport, OtherExport} from \"my-module\";`"
       }]
     },
-    "jsxElement.spaceBeforeSelfClosingTagSlash": {
+    "jsx.spaceBeforeSelfClosingTagSlash": {
       "description": "Whether to add a space before a JSX element's slash when self closing.",
       "type": "boolean",
       "default": true,
@@ -916,8 +916,8 @@
     "importDeclaration.spaceSurroundingNamedImports": {
       "$ref": "#/definitions/importDeclaration.spaceSurroundingNamedImports"
     },
-    "jsxElement.spaceBeforeSelfClosingTagSlash": {
-      "$ref": "#/definitions/jsxElement.spaceBeforeSelfClosingTagSlash"
+    "jsx.spaceBeforeSelfClosingTagSlash": {
+      "$ref": "#/definitions/jsx.spaceBeforeSelfClosingTagSlash"
     },
     "jsxExpressionContainer.spaceSurroundingExpression": {
       "$ref": "#/definitions/jsxExpressionContainer.spaceSurroundingExpression"

src/configuration/builder.rs

@@ -357,8 +357,8 @@ impl ConfigurationBuilder {
   ///
   /// * `true` (default) - Ex. `<Test />`
   /// * `false` - Ex. `<Test/>`
-  pub fn jsx_element_space_before_self_closing_tag_slash(&mut self, value: bool) -> &mut Self {
-    self.insert("jsxElement.spaceBeforeSelfClosingTagSlash", value.into())
+  pub fn jsx_space_before_self_closing_tag_slash(&mut self, value: bool) -> &mut Self {
+    self.insert("jsx.spaceBeforeSelfClosingTagSlash", value.into())
   }
 
   /// Whether to add a space surrounding the properties of an object expression.
@@ -1202,7 +1202,7 @@ mod tests {
       .if_statement_space_after_if_keyword(true)
       .import_declaration_space_surrounding_named_imports(true)
       .jsx_expression_container_space_surrounding_expression(true)
-      .jsx_element_space_before_self_closing_tag_slash(true)
+      .jsx_space_before_self_closing_tag_slash(true)
       .method_space_before_parentheses(true)
       .object_expression_space_surrounding_properties(false)
       .object_pattern_space_surrounding_properties(false)

src/configuration/resolve_config.rs

@@ -32,6 +32,14 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
     fill_deno_config(&mut config);
   }
 
+  // show diagnostics for renaming this property
+  handle_renamed_config_property(
+    &mut config,
+    "jsxElement.spaceBeforeSelfClosingTagSlash",
+    "jsx.spaceBeforeSelfClosingTagSlash",
+    &mut diagnostics,
+  );
+
   let semi_colons = get_value(&mut config, "semiColons", SemiColons::Prefer, &mut diagnostics);
   let brace_position = get_value(&mut config, "bracePosition", BracePosition::SameLineUnlessHanging, &mut diagnostics);
   let next_control_flow_position = get_value(&mut config, "nextControlFlowPosition", NextControlFlowPosition::SameLine, &mut diagnostics);
@@ -260,7 +268,7 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
     if_statement_space_after_if_keyword: get_value(&mut config, "ifStatement.spaceAfterIfKeyword", true, &mut diagnostics),
     import_declaration_space_surrounding_named_imports: get_value(&mut config, "importDeclaration.spaceSurroundingNamedImports", true, &mut diagnostics),
     jsx_expression_container_space_surrounding_expression: get_value(&mut config, "jsxExpressionContainer.spaceSurroundingExpression", false, &mut diagnostics),
-    jsx_element_space_before_self_closing_tag_slash: get_value(&mut config, "jsxElement.spaceBeforeSelfClosingTagSlash", true, &mut diagnostics),
+    jsx_space_before_self_closing_tag_slash: get_value(&mut config, "jsx.spaceBeforeSelfClosingTagSlash", true, &mut diagnostics),
     method_space_before_parentheses: get_value(&mut config, "method.spaceBeforeParentheses", false, &mut diagnostics),
     object_expression_space_surrounding_properties: get_value(
       &mut config,

src/configuration/types.rs

@@ -559,8 +559,8 @@ pub struct Configuration {
   pub import_declaration_space_surrounding_named_imports: bool,
   #[serde(rename = "jsxExpressionContainer.spaceSurroundingExpression")]
   pub jsx_expression_container_space_surrounding_expression: bool,
-  #[serde(rename = "jsxElement.spaceBeforeSelfClosingTagSlash")]
-  pub jsx_element_space_before_self_closing_tag_slash: bool,
+  #[serde(rename = "jsx.spaceBeforeSelfClosingTagSlash")]
+  pub jsx_space_before_self_closing_tag_slash: bool,
   #[serde(rename = "method.spaceBeforeParentheses")]
   pub method_space_before_parentheses: bool,
   #[serde(rename = "objectExpression.spaceSurroundingProperties")]

src/generation/generate.rs

@@ -3581,7 +3581,7 @@ fn gen_jsx_namespaced_name<'a>(node: &'a JSXNamespacedName, context: &mut Contex
 }
 
 fn gen_jsx_opening_element<'a>(node: &'a JSXOpeningElement, context: &mut Context<'a>) -> PrintItems {
-  let space_before_self_closing_tag_slash = context.config.jsx_element_space_before_self_closing_tag_slash;
+  let space_before_self_closing_tag_slash = context.config.jsx_space_before_self_closing_tag_slash;
   let force_use_new_lines = get_force_is_multi_line(node, context);
   let prefer_newline_before_close_bracket = get_should_prefer_newline_before_close_bracket(node, context);
   let start_lsil = LineStartIndentLevel::new("openingElementStart");

tests/specs/jsx/JsxElement/JsxElement_SpaceBeforeSelfClosingTagSlash_False.txt

@@ -1,5 +1,5 @@
 -- file.tsx --
-~~ jsxElement.spaceBeforeSelfClosingTagSlash: false, lineWidth: 40 ~~
+~~ jsx.spaceBeforeSelfClosingTagSlash: false, lineWidth: 40 ~~
 == should avoid space before self closing tag when there are no attributes ==
 const t = <Test />;