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

…d of annotation list item (#281) * fix(pilota-thrift-parser): trim extra whitespace characters at the end of annotation list * fix(pilota-thrift-parser): add the list end blank test case for annotation parser
cloudwego · Nov 4, 2024 · 34d6fd4 · 34d6fd4
1 parent b1078bc
commit 34d6fd4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 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
@@ -51,5 +51,14 @@ mod tests {
     #[test]
     fn test_annotations() {
         let _a = Annotations::parse(r#"(go.tag = "json:\"Ids\" split:\"type=tenant\"")"#).unwrap();
+
+        let input = r#"(
+            cpp.type = "DenseFoo",
+            python.type = "DenseFoo",
+            java.final = "",
+            )"#;
+        let (remain, a) = Annotations::parse(input).unwrap();
+        assert!(remain.is_empty());
+        assert_eq!(a.len(), 3);
     }
 }
diff --git a/pilota-thrift-parser/src/parser/mod.rs b/pilota-thrift-parser/src/parser/mod.rs
@@ -49,7 +49,7 @@ impl Parser for Path {
 }
 
 pub(crate) fn list_separator(input: &str) -> IResult<&str, char> {
-    one_of(",;")(input)
+    map(tuple((one_of(",;"), opt(blank))), |(sep, _)| sep)(input)
 }
 
 fn comment(input: &str) -> IResult<&str, &str> {