Fix to avoid change comma in Markdown frontmater tags. (#294)

Closes #292

Author: huacnlee

autocorrect/grammar/markdown.pest

@@ -4,7 +4,7 @@ line = _{ expr | newline }
 expr = _{
     comment
   | html
-  | meta_info
+  | front_matter
   | block
   | inline
   | td_tag
@@ -21,8 +21,8 @@ CJK = {
 
 /// Block elements, e.g.: paragraphs, lists, code blocks, etc.
 block = ${
-    meta_tags
-  | hr
+    hr
+  | meta_tags
   | list
   | codeblock
   | block_item
@@ -83,18 +83,20 @@ list_prefix    = @{
 /// author: Jason Lee
 /// tags: Rust, JavaScript
 /// ------------------
-meta_info = ${ meta_wrap ~ newline ~ meta_pair* ~ meta_wrap ~ newline* }
-meta_wrap = @{ "-"{3, } }
-meta_pair = ${ meta_key ~ string ~ newline }
-meta_key  = @{ (!(":" | newline) ~ identifier)* ~ ":" ~ " "* }
+front_matter     = ${ front_matter_tag ~ newline ~ (meta_tags | meta_pair)* ~ front_matter_tag ~ newline* }
+front_matter_tag = @{ "-"{3, } }
+meta_pair        = ${ meta_key ~ string ~ newline }
+meta_key         = @{ (!(":" | newline) ~ identifier)* ~ ":" ~ " "* }
 
 /// Ignore tags in Markdown, e.g.: "tags: 美国, 中国"
 meta_tags         = @{ meta_key ~ meta_tags_val+ ~ meta_tags_item ~ newline }
 meta_tags_val     = @{ meta_tags_item ~ meta_tags_divider }
 meta_tags_item    =  { (!(newline | ",") ~ (CJK | " " | ASCII_ALPHANUMERIC))* }
 meta_tags_divider =  { " "* ~ "," ~ " "* }
-image_prefix      = @{ "!" }
-img               = ${ image_prefix ~ (wikilinks | link) }
+
+/// Matches image link, e.g.: `![Alt text](/path/to/img.jpg)` or `![[ImageName]]`
+image_prefix = @{ "!" }
+img          = ${ image_prefix ~ (wikilinks | link) }
 
 /// Matches link, e.g.: `[Hello](/hello)` or `[Hello]`
 link             = ${ link_string_wrap ~ href? }
@@ -123,4 +125,4 @@ close_comment = @{ "-->" }
 paren       = { open_paren ~ inner_paren ~ paren* ~ inner_paren* ~ close_paren | open_paren ~ close_paren }
 inner_paren = { (!(newline | open_paren | close_paren) ~ ANY)+ }
 open_paren  = { "(" }
-close_paren = { ")" }
+close_paren = { ")" }

autocorrect/src/code/markdown.rs

@@ -17,6 +17,31 @@ mod tests {
     use indoc::indoc;
     use pretty_assertions::assert_eq;
 
+    #[test]
+    fn test_frontmatter() {
+        crate::config::setup_test();
+
+        let example = indoc! {r###"
+        ---
+        title: 示例标题Title
+        tags: 测试, 示例
+        ---
+
+        这是正文content，包含一些test文本。
+        "###};
+
+        let expected = indoc! {r###"
+        ---
+        title: 示例标题 Title
+        tags: 测试, 示例
+        ---
+
+        这是正文 content，包含一些 test 文本。
+        "###};
+
+        assert_eq!(expected, format_for(example, "markdown").to_string());
+    }
+
     #[test]
     fn test_format_markdown() {
         crate::config::setup_test();
@@ -28,6 +53,7 @@ mod tests {
         Slug: /appstore/ipad_and_ios
         user.name: Jason
         original_slug: Web/CSS/网格-模板-列
+        tags: 模版, 网格, CSS
         ---
 
         This_Page-Tags: 美国, 中国,德国 , France 法国
@@ -169,6 +195,7 @@ mod tests {
         Slug: /appstore/ipad_and_ios
         user.name: Jason
         original_slug: Web/CSS/网格-模板-列
+        tags: 模版, 网格, CSS
         ---
 
         This_Page-Tags: 美国, 中国,德国 , France 法国