Improve Strategery::new API for more clearly.

Author: huacnlee

autocorrect/src/lib.rs

@@ -112,24 +112,25 @@ lazy_static! {
     // （）【】「」《》
     static ref LEFT_QUOTE_RE: Regex = regexp!("{}", r" ([（【「《])");
     static ref RIGHT_QUOTE_RE: Regex = regexp!("{}", r"([）】」》]) ");
+
     // Strategies all rules
     static ref STRATEGIES: Vec<Strategery> = vec![
         // EnglishLetter, Number
-        // But not start with %, $, \ for avoid change %s, %d, $1, $2, \d, \r, \p ... in source code
-        Strategery::new(r"\p{CJK}[^%\$\\]", r"[a-zA-Z0-9]", true, false),
-        Strategery::new(r"[^%\$\\][a-zA-Z0-9]", r"\p{CJK}", true, false),
+        // But not start with %, $, \ for avoid change %s, %d, $1, $2, \1, \2, \d, \r, \p ... in source code
+        Strategery::new(r"\p{CJK}[^%\$\\]", r"[a-zA-Z0-9]"),
+        Strategery::new(r"[a-zA-Z0-9]", r"\p{CJK}"),
         // 10%中文
-        Strategery::new(r"[0-9][%]", r"\p{CJK}", true, false),
+        Strategery::new(r"[0-9][%]", r"\p{CJK}"),
         // SpecialSymbol
-        Strategery::new(r"\p{CJK}", r"[\|+]", true, true),
+        Strategery::new(r"\p{CJK}", r"[\|+]").with_reverse(),
         // @ after CJK, not not before, 你好 @某某
-        Strategery::new(r"\p{CJK}", r"[@]", true, false),
-        Strategery::new(r"\p{CJK}", r"[\[\(]", true, false),
-        Strategery::new(r"[\]\)!]", r"\p{CJK}", true, false),
+        Strategery::new(r"\p{CJK}", r"[@]"),
+        Strategery::new(r"\p{CJK}", r"[\[\(]"),
+        Strategery::new(r"[\]\)!]", r"\p{CJK}"),
 
         // FullwidthPunctuation remove space case, Fullwidth can safe to remove spaces
-        Strategery::new(r"[\w\p{CJK}]", r"[，。！？：；）」》】”’]", false, true),
-        Strategery::new(r"[‘“【「《（]", r"[\w\p{CJK}]", false, true),
+        Strategery::new(r"[\w\p{CJK}]", r"[，。！？：；）」》】”’]").with_remove_space().with_reverse(),
+        Strategery::new(r"[‘“【「《（]", r"[\w\p{CJK}]").with_remove_space().with_reverse(),
     ];
 }
 
@@ -283,6 +284,7 @@ mod tests {
     #[test]
     fn it_format_for_programming() {
         let cases = map![
+            "A开头的case测试" => "A 开头的 case 测试",
             "内容带有\n不会处理" => "内容带有\n不会处理",
             "内容带有%s或%d或%v特殊字符，或者%S或%D或%V这些特殊format字符" => "内容带有%s或%d或%v特殊字符，或者%S或%D或%V这些特殊 format 字符",
             "内容带有$1或$2或$3特殊字符" => "内容带有$1或$2或$3特殊字符"

autocorrect/src/strategery.rs

@@ -1,6 +1,11 @@
 // autocorrect: false
+enum SpaceMode {
+    Add,
+    Remove,
+}
+
 pub struct Strategery {
-    space: bool,
+    space_mode: SpaceMode,
     reverse: bool,
     add_space_re: regex::Regex,
     add_space_reverse_re: regex::Regex,
@@ -10,36 +15,46 @@ pub struct Strategery {
 
 impl Strategery {
     /// Create a new strategery object.
-    /// ## Arguments
-    ///
-    /// - `space` - `true` - add space / `false` - remove space
-    /// - `reverse` - false just format `(one + other)`, true will format `(other + one)` and `(other + one)`.
-    pub fn new(one: &'static str, other: &'static str, space: bool, reverse: bool) -> Self {
+    pub fn new(one: &'static str, other: &'static str) -> Self {
         return Strategery {
-            space,
-            reverse,
+            space_mode: SpaceMode::Add,
+            reverse: false,
             add_space_re: regexp!("({})({})", one, other),
             add_space_reverse_re: regexp!("({})({})", other, one),
             remove_space_re: regexp!("({})[ ]({})", one, other),
             remove_space_reverse_re: regexp!("({})[ ]({})", other, one),
         };
     }
 
+    // Set Strategery for remove space.
+    pub fn with_remove_space(mut self) -> Self {
+        self.space_mode = SpaceMode::Remove;
+        return self;
+    }
+
+    // Set Strategery for format by reverse again.
+    pub fn with_reverse(mut self) -> Self {
+        self.reverse = true;
+        return self;
+    }
+
     pub fn format(&self, text: &str) -> String {
-        if self.space {
-            self.add_space(text)
-        } else {
-            self.remove_space(text)
+        match self.space_mode {
+            SpaceMode::Add => self.add_space(text),
+            SpaceMode::Remove => self.remove_space(text),
         }
     }
 
     fn add_space(&self, text: &str) -> String {
         let mut out = String::from(text);
 
-        out = (&self.add_space_re.replace_all(&out, "$1 $2")).to_string();
+        out = self.add_space_re.replace_all(&out, "$1 $2").to_string();
 
         if self.reverse {
-            out = (&self.add_space_reverse_re.replace_all(&out, "$1 $2")).to_string();
+            out = self
+                .add_space_reverse_re
+                .replace_all(&out, "$1 $2")
+                .to_string();
         }
 
         out