From ac879d7b9b37ed6a86d65066cb3bbc48c61934a4 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Mon, 24 Aug 2020 12:40:29 +0800
Subject: [PATCH] fix: fix rename issue

---
 scie-grammar/src/inter/mod.rs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/scie-grammar/src/inter/mod.rs b/scie-grammar/src/inter/mod.rs
index be2e17b..f2fa1a1 100644
--- a/scie-grammar/src/inter/mod.rs
+++ b/scie-grammar/src/inter/mod.rs
@@ -87,7 +87,7 @@ pub struct IRawRule {
     pub include: Option<String>,
     pub name: Option<String>,
 
-    #[serde(alias = "content_name")]
+    #[serde(alias = "contentName")]
     pub content_name: Option<String>,
 
     #[serde(alias = "match")]
@@ -110,9 +110,9 @@ pub struct IRawRule {
     pub patterns: Option<Vec<IRawRule>>,
     pub repository: Option<IRawRepository>,
 
-    pub applyEndPatternLast: Option<bool>,
+    #[serde(alias = "applyEndPatternLast")]
+    pub apply_end_pattern_last: Option<bool>,
 
-    #[serde(alias = "information_for_contributors")]
     pub information_for_contributors: Option<Vec<String>>,
 }
 
@@ -135,7 +135,7 @@ impl IRawRule {
             patterns: None,
             repository: None,
             information_for_contributors: None,
-            applyEndPatternLast: None,
+            apply_end_pattern_last: None,
         }
     }
 }
@@ -378,4 +378,20 @@ mod tests {
             assert_eq!(true, p.scope_name.len() > 0);
         }
     }
+
+    #[test]
+    fn should_read_java_repository() {
+        let path = Path::new("test-cases/first-mate/fixtures/json.json");
+
+        let mut file = File::open(path).unwrap();
+        let mut data = String::new();
+        file.read_to_string(&mut data).unwrap();
+        let p: IRawGrammar = match serde_json::from_str(&data) {
+            Ok(x) => x,
+            Err(err) => {
+                IRawGrammar::new()
+            }
+        };
+        assert_eq!(6, p.repository.unwrap().map.name_map.len());
+    }
 }
-- 
GitLab