chore: update schema.json to have jsx.multiLineParens changes

Author: dsherret

deployment/schema.json

@@ -62,14 +62,17 @@
     },
     "jsx.multiLineParens": {
       "description": "Surrounds the top-most JSX element or fragment in parentheses when it spans multiple lines.",
-      "type": "boolean",
-      "default": true,
+      "type": "string",
+      "default": "prefer",
       "oneOf": [{
-        "const": true,
-        "description": ""
+        "const": "never",
+        "description": "Never wrap JSX with parentheses."
       }, {
-        "const": false,
-        "description": ""
+        "const": "prefer",
+        "description": "Prefer wrapping with parentheses in most scenarios, except in function arguments and JSX attributes."
+      }, {
+        "const": "always",
+        "description": "Always wrap JSX with parentheses if it spans multiple lines."
       }]
     },
     "newLineKind": {

src/configuration/builder.rs

@@ -65,7 +65,7 @@ impl ConfigurationBuilder {
       .tagged_template_space_before_literal(false)
       .conditional_expression_prefer_single_line(true)
       .quote_style(QuoteStyle::PreferDouble)
-      .jsx_multi_line_parens(JsxMultiLineParensStyle::Prefer)
+      .jsx_multi_line_parens(JsxMultiLineParens::Prefer)
       .ignore_node_comment_text("deno-fmt-ignore")
       .ignore_file_comment_text("deno-fmt-ignore-file")
       .module_sort_import_declarations(SortOrder::Maintain)
@@ -117,8 +117,8 @@ impl ConfigurationBuilder {
   /// Whether to surround a JSX element or fragment with parentheses
   /// when it's the top JSX node and it spans multiple lines.
   ///
-  /// Default: true
-  pub fn jsx_multi_line_parens(&mut self, value: JsxMultiLineParensStyle) -> &mut Self {
+  /// Default: `JsxMultiLineParens::Prefer`
+  pub fn jsx_multi_line_parens(&mut self, value: JsxMultiLineParens) -> &mut Self {
     self.insert("jsx.multiLineParens", value.to_string().into())
   }
 
@@ -939,7 +939,7 @@ mod tests {
       /* common */
       .quote_style(QuoteStyle::AlwaysDouble)
       .jsx_quote_style(JsxQuoteStyle::PreferSingle)
-      .jsx_multi_line_parens(JsxMultiLineParensStyle::Never)
+      .jsx_multi_line_parens(JsxMultiLineParens::Never)
       .semi_colons(SemiColons::Prefer)
       .brace_position(BracePosition::NextLine)
       .next_control_flow_position(NextControlFlowPosition::SameLine)

src/configuration/resolve_config.rs

@@ -77,7 +77,7 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
     arrow_function_use_parentheses: get_value(&mut config, "arrowFunction.useParentheses", UseParentheses::Maintain, &mut diagnostics),
     binary_expression_line_per_expression: get_value(&mut config, "binaryExpression.linePerExpression", false, &mut diagnostics),
     jsx_quote_style: get_value(&mut config, "jsx.quoteStyle", quote_style.to_jsx_quote_style(), &mut diagnostics),
-    jsx_multi_line_parens: get_value(&mut config, "jsx.multiLineParens", JsxMultiLineParensStyle::Prefer, &mut diagnostics),
+    jsx_multi_line_parens: get_value(&mut config, "jsx.multiLineParens", JsxMultiLineParens::Prefer, &mut diagnostics),
     member_expression_line_per_expression: get_value(&mut config, "memberExpression.linePerExpression", false, &mut diagnostics),
     type_literal_separator_kind_single_line: get_value(
       &mut config,

src/configuration/types.rs

@@ -210,7 +210,7 @@ generate_str_to_from![JsxQuoteStyle, [PreferDouble, "preferDouble"], [PreferSing
 /// when it's the top JSX node and it spans multiple lines.
 #[derive(Clone, PartialEq, Copy, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub enum JsxMultiLineParensStyle {
+pub enum JsxMultiLineParens {
   /// Never wrap JSX with parentheses.
   Never,
   /// Prefer wrapping with parentheses in most scenarios, except in function
@@ -220,7 +220,7 @@ pub enum JsxMultiLineParensStyle {
   Always,
 }
 
-generate_str_to_from![JsxMultiLineParensStyle, [Never, "never"], [Prefer, "prefer"], [Always, "always"]];
+generate_str_to_from![JsxMultiLineParens, [Never, "never"], [Prefer, "prefer"], [Always, "always"]];
 
 /// Whether to use semi-colons or commas.
 #[derive(Clone, PartialEq, Copy, Serialize, Deserialize)]
@@ -270,7 +270,7 @@ pub struct Configuration {
   #[serde(rename = "jsx.quoteStyle")]
   pub jsx_quote_style: JsxQuoteStyle,
   #[serde(rename = "jsx.multiLineParens")]
-  pub jsx_multi_line_parens: JsxMultiLineParensStyle,
+  pub jsx_multi_line_parens: JsxMultiLineParens,
   #[serde(rename = "memberExpression.linePerExpression")]
   pub member_expression_line_per_expression: bool,
   #[serde(rename = "typeLiteral.separatorKind.singleLine")]

src/parsing/parser.rs

@@ -3048,7 +3048,7 @@ fn handle_jsx_surrounding_parens<'a>(inner_items: PrintItems, context: &mut Cont
     }
   }
 
-  if context.parent().is::<JSXExprContainer>() && context.config.jsx_multi_line_parens != JsxMultiLineParensStyle::Always {
+  if context.parent().is::<JSXExprContainer>() && context.config.jsx_multi_line_parens != JsxMultiLineParens::Always {
     return surround_with_newlines_indented_if_multi_line(inner_items, context.config.indent_width);
   }
 
@@ -3093,7 +3093,7 @@ fn handle_jsx_surrounding_parens<'a>(inner_items: PrintItems, context: &mut Cont
 }
 
 fn is_jsx_paren_expr_handled_node(node: &Node, context: &Context) -> bool {
-  if context.config.jsx_multi_line_parens == JsxMultiLineParensStyle::Never {
+  if context.config.jsx_multi_line_parens == JsxMultiLineParens::Never {
     return false;
   }
 
@@ -3118,7 +3118,7 @@ fn is_jsx_paren_expr_handled_node(node: &Node, context: &Context) -> bool {
     parent = parent.parent().unwrap();
   }
 
-  if context.config.jsx_multi_line_parens == JsxMultiLineParensStyle::Always {
+  if context.config.jsx_multi_line_parens == JsxMultiLineParens::Always {
     return true;
   }
 
@@ -7947,18 +7947,11 @@ fn jsx_space_separator(previous_node: &Node, current_node: &Node, context: &Cont
     }
   }
 
-  fn get_quote_char(context: &Context) -> String {
-    return match context.config.quote_style {
-      QuoteStyle::PreferDouble | QuoteStyle::AlwaysDouble => "\"".to_string(),
-      QuoteStyle::PreferSingle | QuoteStyle::AlwaysSingle => "'".to_string()
-    };
-  }
-
   fn jsx_force_space_with_newline_if_either_node_multi_line(previous_node: &Node, current_node: &Node, context: &Context) -> PrintItems {
     let previous_node_info_range = get_node_info_range(previous_node, context);
     let current_node_info_range = get_node_info_range(current_node, context);
     let spaces_between_count = node_helpers::count_spaces_between_jsx_children(previous_node, current_node, &context.module);
-    let jsx_space_expr_text = format!("{{{}{}{}}}", get_quote_char(context), " ".repeat(spaces_between_count), get_quote_char(context));
+    let jsx_space_expr_text = get_jsx_space_text(spaces_between_count, context);
     if_true_or(
       "jsxIsLastChildMultiLine",
       move |condition_context| {
@@ -8005,7 +7998,7 @@ fn jsx_space_separator(previous_node: &Node, current_node: &Node, context: &Cont
 
     if spaces_between_count > 1 {
       items.push_signal(Signal::PossibleNewLine);
-      items.push_string(format!("{{{}{}{}}}", get_quote_char(context), " ".repeat(spaces_between_count), get_quote_char(context)));
+      items.push_string(get_jsx_space_text(spaces_between_count, context));
       items.push_signal(Signal::PossibleNewLine);
       return items;
     }
@@ -8045,7 +8038,7 @@ fn jsx_space_separator(previous_node: &Node, current_node: &Node, context: &Cont
         true_path: {
           let mut items = PrintItems::new();
           items.push_signal(Signal::PossibleNewLine);
-          items.push_string(format!("{{{} {}}}", get_quote_char(context), get_quote_char(context)));
+          items.push_string(get_jsx_space_text(1, context));
           items.push_signal(Signal::NewLine);
           Some(items)
         },
@@ -8058,6 +8051,17 @@ fn jsx_space_separator(previous_node: &Node, current_node: &Node, context: &Cont
   }
 }
 
+fn get_jsx_space_text(spaces_between_count: usize, context: &Context) -> String {
+  format!("{{{}{}{}}}", get_quote_char(context), " ".repeat(spaces_between_count), get_quote_char(context))
+}
+
+fn get_quote_char(context: &Context) -> String {
+  return match context.config.quote_style {
+    QuoteStyle::PreferDouble | QuoteStyle::AlwaysDouble => "\"".to_string(),
+    QuoteStyle::PreferSingle | QuoteStyle::AlwaysSingle => "'".to_string(),
+  };
+}
+
 #[inline]
 fn parse_assignment<'a>(expr: Node<'a>, op: &str, context: &mut Context<'a>) -> PrintItems {
   parse_assignment_op_to(expr, op, op, context)