From d0a94101bcceab0d2ca4dcb710d8057d317e4972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar=20Rubio?= Date: Wed, 14 Aug 2024 23:26:21 +0200 Subject: [PATCH 1/2] Fix possible empty quote --- .gitignore | 1 + Cargo.lock | 11 +++++++++-- leptos-fluent-macros/src/lib.rs | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a52d97fc..62c1cc9d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules/ dist/ .prettier-cache /book/book +/leptos-fluent-macros/wip/ diff --git a/Cargo.lock b/Cargo.lock index f99363dc..744ef724 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -555,12 +555,13 @@ checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" [[package]] name = "cc" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" +checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -3146,6 +3147,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" diff --git a/leptos-fluent-macros/src/lib.rs b/leptos-fluent-macros/src/lib.rs index f63df0ed..808fb0ea 100644 --- a/leptos-fluent-macros/src/lib.rs +++ b/leptos-fluent-macros/src/lib.rs @@ -759,7 +759,7 @@ pub fn leptos_fluent( }; match quote.is_empty() { - true => quote! {}, + true => quote! { false }, false => match param.exprpath { Some(ref path) => quote! { #path{#quote} }, None => quote, @@ -818,7 +818,7 @@ pub fn leptos_fluent( }; match quote.is_empty() { - true => quote! {}, + true => quote! { false }, false => match param.exprpath { Some(ref path) => quote! { #path{#quote} }, None => quote, From 5f5640eeb2cd81c5df2f7a1fdf972865b1cab3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar=20Rubio?= Date: Wed, 14 Aug 2024 23:30:07 +0200 Subject: [PATCH 2/2] Remove uneeded code --- leptos-fluent-macros/src/lib.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/leptos-fluent-macros/src/lib.rs b/leptos-fluent-macros/src/lib.rs index 808fb0ea..9c5026d2 100644 --- a/leptos-fluent-macros/src/lib.rs +++ b/leptos-fluent-macros/src/lib.rs @@ -728,9 +728,6 @@ pub fn leptos_fluent( for attr in html_tag_as_string.split(' ') { let mut parts = attr.split('='); let key = parts.next().unwrap_or(""); - if key.is_empty() { - continue; - } let value = parts.next().unwrap_or(""); if key == "class" { class = Some(value.trim_matches('"').to_string().into());