refaactor: #11 - typeLiteral.separatorKind should be singular

Author: dsherret

Cargo.lock

@@ -2,7 +2,7 @@
 name = "dprint-plugin-typescript"
 description = "TypeScript code formatting plugin for dprint."
 keywords = ["formatting", "formatter", "typescript"]
-version = "0.28.1"
+version = "0.29.0"
 authors = ["David Sherret <[email protected]>"]
 edition = "2018"
 license = "MIT"

Cargo.toml

@@ -387,17 +387,17 @@ impl ConfigurationBuilder {
     }
 
     /// The kind of separator to use in type literals.
-    pub fn type_literal_separator_kind(&mut self, value: SemiColonsOrCommas) -> &mut Self {
+    pub fn type_literal_separator_kind(&mut self, value: SemiColonOrComma) -> &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: SemiColonsOrCommas) -> &mut Self {
+    pub fn type_literal_separator_kind_single_line(&mut self, value: SemiColonOrComma) -> &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: SemiColonsOrCommas) -> &mut Self {
+    pub fn type_literal_separator_kind_multi_line(&mut self, value: SemiColonOrComma) -> &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(SemiColonsOrCommas::Commas)
-            .type_literal_separator_kind_single_line(SemiColonsOrCommas::Commas)
-            .type_literal_separator_kind_multi_line(SemiColonsOrCommas::Commas)
+            .type_literal_separator_kind(SemiColonOrComma::Comma)
+            .type_literal_separator_kind_single_line(SemiColonOrComma::Comma)
+            .type_literal_separator_kind_multi_line(SemiColonOrComma::Comma)
             /* ignore comments */
             .ignore_node_comment_text("ignore")
             .ignore_file_comment_text("ignore-file")

src/configuration/builder.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", SemiColonsOrCommas::SemiColons, &mut diagnostics);
+    let type_literal_separator_kind = get_value(&mut config, "typeLiteral.separatorKind", SemiColonOrComma::SemiColon, &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/resolve_config.rs

@@ -220,17 +220,17 @@ generate_str_to_from![
 /// Whether to use semi-colons or commas.
 #[derive(Clone, PartialEq, Copy, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub enum SemiColonsOrCommas {
+pub enum SemiColonOrComma {
     /// Use semi colons (default).
-    SemiColons,
+    SemiColon,
     /// Use commas.
-    Commas,
+    Comma,
 }
 
 generate_str_to_from![
-    SemiColonsOrCommas,
-    [SemiColons, "semiColons"],
-    [Commas, "commas"]
+    SemiColonOrComma,
+    [SemiColon, "semiColon"],
+    [Comma, "comma"]
 ];
 
 #[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: SemiColonsOrCommas,
+    pub type_literal_separator_kind_single_line: SemiColonOrComma,
     #[serde(rename = "typeLiteral.separatorKind.multiLine")]
-    pub type_literal_separator_kind_multi_line: SemiColonsOrCommas,
+    pub type_literal_separator_kind_multi_line: SemiColonOrComma,
     /* ignore comments */
     pub ignore_node_comment_text: String,
     pub ignore_file_comment_text: String,

src/configuration/types.rs

@@ -2430,10 +2430,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: SemiColonsOrCommas, context: &mut Context) -> SeparatorValue {
+    fn semi_colon_or_comma_to_separator_value(value: SemiColonOrComma, context: &mut Context) -> SeparatorValue {
         match value {
-            SemiColonsOrCommas::Commas => SeparatorValue::Comma(context.config.type_literal_trailing_commas),
-            SemiColonsOrCommas::SemiColons => SeparatorValue::SemiColon(context.config.semi_colons),
+            SemiColonOrComma::Comma => SeparatorValue::Comma(context.config.type_literal_trailing_commas),
+            SemiColonOrComma::SemiColon => SeparatorValue::SemiColon(context.config.semi_colons),
         }
     }
 }

src/parsing/parser.rs

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

tests/specs/issues/issue0011.txt

@@ -1,4 +1,4 @@
-~~ typeLiteral.separatorKind: commas ~~
+~~ typeLiteral.separatorKind: comma ~~
 == should use commas when single line ==
 type Test = { p: string, u: number };
 

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

@@ -1,4 +1,4 @@
-~~ typeLiteral.separatorKind.singleLine: commas, typeLiteral.separatorKind.multiLine: semiColons, lineWidth: 40 ~~
+~~ typeLiteral.separatorKind.singleLine: comma, typeLiteral.separatorKind.multiLine: semiColon, lineWidth: 40 ~~
 == should use commas when single line ==
 type Test = { p: string, u: number };
 

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

@@ -1,4 +1,4 @@
-~~ typeLiteral.separatorKind.singleLine: semiColons, typeLiteral.separatorKind.multiLine: commas, lineWidth: 40 ~~
+~~ typeLiteral.separatorKind.singleLine: semiColon, typeLiteral.separatorKind.multiLine: comma, lineWidth: 40 ~~
 == should use commas when single line ==
 type Test = { p: string, u: number };