Add colonsAdd colon assignment syntax for tr!, similar to struct fiel…

…d assignment For example: tr!("Hello, %{name}", name: "world");
longbridge · Jan 20, 2024 · be265e8 · be265e8
1 parent 9037613
commit be265e8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/crates/macro/src/lib.rs b/crates/macro/src/lib.rs
@@ -358,7 +358,9 @@ pub fn vakey(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 /// // => "Hello, Foo and Bar" (Key `tr_3eULVGYoyiBuaM27F93Mo7` for "Hello, %{name} and %{other}")
 ///
 /// // With locale and variables
-/// tr!("Hallo, %{name}", locale = "de", name = "Jason");
+/// tr!("Hallo, %{name}", locale = "de", name => "Jason"); // Arrow style
+/// tr!("Hallo, %{name}", locale = "de", name = "Jason"); // Asignment style
+/// tr!("Hallo, %{name}", locale = "de", name : "Jason"); // Colon style
 /// // => "Hallo, Jason" (Key `tr_4Cct6Q289b12SkvF47dXIx` for "Hallo, %{name}")
 /// # }
 /// ```

diff --git a/crates/macro/src/tr.rs b/crates/macro/src/tr.rs
@@ -27,8 +27,15 @@ impl syn::parse::Parse for Argument {
             .map(|v| v.to_string())
             .or_else(|_| input.parse::<LitStr>().map(|v| v.value()))
             .map_err(|_| input.error("Expected a `string` literal or an identifier"))?;
-        let _ = input.parse::<Token![=]>()?;
-        let _ = input.parse::<Option<Token![>]>>()?;
+        if input.peek(Token![=>]) {
+            let _ = input.parse::<Token![=>]>()?;
+        } else if input.peek(Token![=]) {
+            let _ = input.parse::<Token![=]>()?;
+        } else if input.peek(Token![:]) {
+            let _ = input.parse::<Token![:]>()?;
+        } else {
+            return Err(input.error("Expected `=>`, `=` or `:`"));
+        }
         let value = input.parse::<Expr>()?;
         Ok(Self { name, value })
     }

diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -225,7 +225,11 @@ mod tests {
         );
 
         rust_i18n::set_locale("zh-CN");
+        assert_eq!(tr!("Hello, %{name}!", name => "world"), "你好，world！");
         assert_eq!(tr!("Hello, %{name}!", name = "world"), "你好，world！");
+        assert_eq!(tr!("Hello, %{name}!", name : "world"), "你好，world！");
+        assert_eq!(tr!("Hello, %{name}!", name: "world"), "你好，world！");
+        assert_eq!(tr!("Hello, %{name}!", name:"world"), "你好，world！");
 
         rust_i18n::set_locale("en");
         assert_eq!(tr!("Hello, %{name}!", name = "world"), "Hello, world!");