fix(pilota-thrift-parser): trim extra whitespace characters at the en…

…d of annotation list
cloudwego · Nov 3, 2024 · b72c5d7 · b72c5d7
1 parent b1078bc
commit b72c5d7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 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.2"
+version = "0.11.3"
 edition = "2021"
 description = "Pilota thrift Parser."
 documentation = "https://docs.rs/pilota"

diff --git a/pilota-thrift-parser/src/parser/annotation.rs b/pilota-thrift-parser/src/parser/annotation.rs
@@ -31,8 +31,9 @@ impl Parser for Annotations {
                         Literal::parse,
                         opt(blank),
                         opt(list_separator),
+                        opt(blank),
                     )),
-                    |(_, p, _, _, _, lit, _, _)| Annotation {
+                    |(_, p, _, _, _, lit, _, _, _)| Annotation {
                         key: p.to_owned(),
                         value: lit,
                     },

diff --git a/pilota-thrift-parser/src/parser/struct_.rs b/pilota-thrift-parser/src/parser/struct_.rs
@@ -95,8 +95,14 @@ mod tests {
         let str = r#"struct ImMsgContent {
             1: string user_id (go.tag = 'json:\"user_id,omitempty\"'),
             2: string __files (go.tag = 'json:\"__files,omitempty\"'),
-        }"#;
-        Struct::parse(str).unwrap();
+        }
+        (
+        cpp.type = "DenseFoo",
+        python.type = "DenseFoo",
+        java.final = "",
+        )"#;
+        let (remain, _) = Struct::parse(str).unwrap();
+        assert!(remain.is_empty());
     }
 
     #[test]