Pluralize option values.

Author: dsherret

src/configuration/builder.rs

@@ -387,17 +387,17 @@ impl ConfigurationBuilder {
     }
 
     /// The kind of separator to use in type literals.
-    pub fn type_literal_separator_kind(&mut self, value: SemiColonOrComma) -> &mut Self {
+    pub fn type_literal_separator_kind(&mut self, value: SemiColonsOrCommas) -> &mut Self {
         self.insert("typeLiteral.separatorKind", value.to_string().into())
     }
 
     /// The kind of separator to use in type literals when single line.
-    pub fn type_literal_separator_kind_single_line(&mut self, value: SemiColonOrComma) -> &mut Self {
+    pub fn type_literal_separator_kind_single_line(&mut self, value: SemiColonsOrCommas) -> &mut Self {
         self.insert("typeLiteral.separatorKind.singleLine", value.to_string().into())
     }
 
     /// The kind of separator to use in type literals when multi-line.
-    pub fn type_literal_separator_kind_multi_line(&mut self, value: SemiColonOrComma) -> &mut Self {
+    pub fn type_literal_separator_kind_multi_line(&mut self, value: SemiColonsOrCommas) -> &mut Self {
         self.insert("typeLiteral.separatorKind.multiLine", value.to_string().into())
     }
 
@@ -856,9 +856,9 @@ mod tests {
             .arrow_function_use_parentheses(UseParentheses::Maintain)
             .binary_expression_line_per_expression(false)
             .member_expression_line_per_expression(false)
-            .type_literal_separator_kind(SemiColonOrComma::Comma)
-            .type_literal_separator_kind_single_line(SemiColonOrComma::Comma)
-            .type_literal_separator_kind_multi_line(SemiColonOrComma::Comma)
+            .type_literal_separator_kind(SemiColonsOrCommas::Commas)
+            .type_literal_separator_kind_single_line(SemiColonsOrCommas::Commas)
+            .type_literal_separator_kind_multi_line(SemiColonsOrCommas::Commas)
             /* ignore comments */
             .ignore_node_comment_text("ignore")
             .ignore_file_comment_text("ignore-file")

src/configuration/resolve_config.rs

@@ -41,7 +41,7 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
     let use_braces = get_value(&mut config, "useBraces", UseBraces::WhenNotSingleLine, &mut diagnostics);
     let prefer_hanging = get_value(&mut config, "preferHanging", false, &mut diagnostics);
     let prefer_single_line = get_value(&mut config, "preferSingleLine", false, &mut diagnostics);
-    let type_literal_separator_kind = get_value(&mut config, "typeLiteral.separatorKind", SemiColonOrComma::SemiColon, &mut diagnostics);
+    let type_literal_separator_kind = get_value(&mut config, "typeLiteral.separatorKind", SemiColonsOrCommas::SemiColons, &mut diagnostics);
 
     let resolved_config = Configuration {
         line_width: get_value(&mut config, "lineWidth", global_config.line_width.unwrap_or(DEFAULT_GLOBAL_CONFIGURATION.line_width), &mut diagnostics),

src/configuration/types.rs

@@ -217,20 +217,20 @@ generate_str_to_from![
     [PreferSingle, "preferSingle"]
 ];
 
-/// Whether to use a semi-colon or comma.
+/// Whether to use semi-colons or commas.
 #[derive(Clone, PartialEq, Copy, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub enum SemiColonOrComma {
+pub enum SemiColonsOrCommas {
     /// Use semi colons (default).
-    SemiColon,
+    SemiColons,
     /// Use commas.
-    Comma,
+    Commas,
 }
 
 generate_str_to_from![
-    SemiColonOrComma,
-    [SemiColon, "semiColon"],
-    [Comma, "comma"]
+    SemiColonsOrCommas,
+    [SemiColons, "semiColons"],
+    [Commas, "commas"]
 ];
 
 #[derive(Clone, Serialize, Deserialize)]
@@ -250,9 +250,9 @@ pub struct Configuration {
     #[serde(rename = "memberExpression.linePerExpression")]
     pub member_expression_line_per_expression: bool,
     #[serde(rename = "typeLiteral.separatorKind.singleLine")]
-    pub type_literal_separator_kind_single_line: SemiColonOrComma,
+    pub type_literal_separator_kind_single_line: SemiColonsOrCommas,
     #[serde(rename = "typeLiteral.separatorKind.multiLine")]
-    pub type_literal_separator_kind_multi_line: SemiColonOrComma,
+    pub type_literal_separator_kind_multi_line: SemiColonsOrCommas,
     /* ignore comments */
     pub ignore_node_comment_text: String,
     pub ignore_file_comment_text: String,

src/parsing/parser.rs

@@ -2409,10 +2409,10 @@ fn parse_type_lit<'a>(node: &'a TsTypeLit, context: &mut Context<'a>) -> PrintIt
         surround_single_line_with_spaces: true,
     }, context);
 
-    fn semi_colon_or_comma_to_separator_value(value: SemiColonOrComma, context: &mut Context) -> SeparatorValue {
+    fn semi_colon_or_comma_to_separator_value(value: SemiColonsOrCommas, context: &mut Context) -> SeparatorValue {
         match value {
-            SemiColonOrComma::Comma => SeparatorValue::Comma(context.config.type_literal_trailing_commas),
-            SemiColonOrComma::SemiColon => SeparatorValue::SemiColon(context.config.semi_colons),
+            SemiColonsOrCommas::Commas => SeparatorValue::Comma(context.config.type_literal_trailing_commas),
+            SemiColonsOrCommas::SemiColons => SeparatorValue::SemiColon(context.config.semi_colons),
         }
     }
 }

tests/specs/issues/issue0011.txt

@@ -1,5 +1,5 @@
-~~ semiColons: asi, typeLiteral.separatorKind.singleLine: comma ~~
-== should use a comma when single line ==
+~~ semiColons: asi, typeLiteral.separatorKind.singleLine: commas ~~
+== should use commas when single line ==
 type Test = { p: string, u: number };
 
 [expect]

tests/specs/types/TypeLiteral/TypeLiteral_SeparatorKind_Comma.txt renamed to tests/specs/types/TypeLiteral/TypeLiteral_SeparatorKind_Commas.txt

@@ -1,11 +1,11 @@
-~~ typeLiteral.separatorKind: comma ~~
-== should use a comma when single line ==
+~~ typeLiteral.separatorKind: commas ~~
+== should use commas when single line ==
 type Test = { p: string, u: number };
 
 [expect]
 type Test = { p: string, u: number };
 
-== should use a comma when multi-line ==
+== should use commas when multi-line ==
 type Test = {
     p: string, u: number };
 

tests/specs/types/TypeLiteral/TypeLiteral_SeparatorKind_CommaSingle_SemiColonMulti.txt renamed to tests/specs/types/TypeLiteral/TypeLiteral_SeparatorKind_CommasSingle_SemiColonsMulti.txt

@@ -1,11 +1,11 @@
-~~ typeLiteral.separatorKind.singleLine: comma, typeLiteral.separatorKind.multiLine: semiColon, lineWidth: 40 ~~
-== should use a comma when single line ==
+~~ typeLiteral.separatorKind.singleLine: commas, typeLiteral.separatorKind.multiLine: semiColons, lineWidth: 40 ~~
+== should use commas when single line ==
 type Test = { p: string, u: number };
 
 [expect]
 type Test = { p: string, u: number };
 
-== should use semi-colon when multi-line ==
+== should use semi-colons when multi-line ==
 type Test = {
     p: string, u: number };
 
@@ -15,7 +15,7 @@ type Test = {
     u: number;
 };
 
-== should use a semi-colon going from single line to multi ==
+== should use semi-colons going from single line to multi ==
 type Test = { p: string, u: number, test: other };
 
 [expect]

tests/specs/types/TypeLiteral/TypeLiteral_SeparatorKind_SemiColonSingle_CommaMulti.txt renamed to tests/specs/types/TypeLiteral/TypeLiteral_SeparatorKind_SemiColonsSingle_CommasMulti.txt

@@ -1,11 +1,11 @@
-~~ typeLiteral.separatorKind.singleLine: semiColon, typeLiteral.separatorKind.multiLine: comma, lineWidth: 40 ~~
-== should use a comma when single line ==
+~~ typeLiteral.separatorKind.singleLine: semiColons, typeLiteral.separatorKind.multiLine: commas, lineWidth: 40 ~~
+== should use commas when single line ==
 type Test = { p: string, u: number };
 
 [expect]
 type Test = { p: string; u: number };
 
-== should use semi-colon when multi-line ==
+== should use semi-colons when multi-line ==
 type Test = {
     p: string, u: number };
 
@@ -15,7 +15,7 @@ type Test = {
     u: number,
 };
 
-== should use a comma going from single line to multi ==
+== should use commas going from single line to multi ==
 type Test = { p: string; u: number; test: other };
 
 [expect]