fix(pilota-thrift-parser): compatible with separators after syntax it…

…em blocks in idl (#284) * fix(pilota-thrift-parser): compatible with separators after different item blocks in idl * chore: add separator compatibility test for idl parser --------- Co-authored-by: Pure White <[email protected]>
cloudwego · Nov 5, 2024 · 16ad613 · 16ad613
1 parent 376d69d
commit 16ad613
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pilota-thrift-parser/Cargo.toml b/pilota-thrift-parser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pilota-thrift-parser"
-version = "0.11.3"
+version = "0.11.4"
 edition = "2021"
 description = "Pilota thrift Parser."
 documentation = "https://docs.rs/pilota"

diff --git a/pilota-thrift-parser/src/parser/enum_.rs b/pilota-thrift-parser/src/parser/enum_.rs
@@ -23,9 +23,8 @@ impl Parser for EnumValue {
                 opt(blank),
                 opt(Annotations::parse),
                 opt(list_separator),
-                opt(blank),
             )),
-            |(name, _, value, _, annotations, _, _)| EnumValue {
+            |(name, _, value, _, annotations, _)| EnumValue {
                 name,
                 value,
                 annotations: annotations.unwrap_or_default(),

diff --git a/pilota-thrift-parser/src/parser/service.rs b/pilota-thrift-parser/src/parser/service.rs
@@ -28,8 +28,9 @@ impl Parser for Service {
                 tag("}"),
                 opt(blank),
                 opt(Annotations::parse),
+                opt(list_separator),
             )),
-            |(_, _, name, extends, _, _, functions, _, _, _, annotations)| Service {
+            |(_, _, name, extends, _, _, functions, _, _, _, annotations, _)| Service {
                 name,
                 extends,
                 functions,

diff --git a/pilota-thrift-parser/src/parser/struct_.rs b/pilota-thrift-parser/src/parser/struct_.rs
@@ -50,8 +50,9 @@ impl Parser for StructLike {
                 tag("}"),
                 opt(blank),
                 opt(Annotations::parse),
+                opt(list_separator),
             )),
-            |(name, _, _, fields, _, _, _, annotations)| StructLike {
+            |(name, _, _, fields, _, _, _, annotations, _)| StructLike {
                 name,
                 fields,
                 annotations: annotations.unwrap_or_default(),

diff --git a/pilota-thrift-parser/src/parser/thrift.rs b/pilota-thrift-parser/src/parser/thrift.rs
@@ -152,4 +152,31 @@ mod tests {
         "#;
         let (_remain, _res) = File::parse(body).unwrap();
     }
+
+    #[test]
+    fn test_separator() {
+        let body = r#"typedef i32 MyInt32
+typedef string MyString;
+
+struct TypedefTestStruct {
+  1: MyInt32 field_MyInt32;
+  2: MyString field_MyString;
+  3: i32 field_Int32;
+  4: string field_String;
+};
+
+typedef TypedefTestStruct MyStruct,
+
+const list<string> TEST_LIST = [
+    "hello",
+    "world",
+];
+
+service Service {
+  MyStruct testEpisode(1:MyStruct arg)
+},"#;
+        let (remain, res) = File::parse(body).unwrap();
+        assert!(remain.is_empty());
+        assert_eq!(res.items.len(), 6);
+    }
 }
diff --git a/pilota-thrift-parser/src/parser/typedef.rs b/pilota-thrift-parser/src/parser/typedef.rs
@@ -21,8 +21,9 @@ impl Parser for Typedef {
                 Ident::parse,
                 opt(blank),
                 opt(Annotations::parse),
+                opt(list_separator),
             )),
-            |(_, _, r#type, _, alias, _, annotations)| Typedef {
+            |(_, _, r#type, _, alias, _, annotations, _)| Typedef {
                 r#type,
                 alias,
                 annotations: annotations.unwrap_or_default(),