Merge remote-tracking branch 'origin/main'

mdn · Nov 1, 2024 · a8a184c · a8a184c
2 parents f045953 + dbb6d42
commit a8a184c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/crates/rari-doc/src/templ/parser.rs b/crates/rari-doc/src/templ/parser.rs
@@ -73,6 +73,9 @@ pub enum Token {
 
 fn to_arg(pair: Pair<'_, Rule>) -> Option<Arg> {
     match pair.as_rule() {
+        Rule::single_quoted_string => pair.into_inner().next().and_then(to_arg),
+        Rule::double_quoted_string => pair.into_inner().next().and_then(to_arg),
+        Rule::backquoted_quoted_string => pair.into_inner().next().and_then(to_arg),
         Rule::sq_string => {
             let s = pair.as_span().as_str();
             Some(Arg::String(

diff --git a/crates/rari-doc/src/templ/rari-templ.pest b/crates/rari-doc/src/templ/rari-templ.pest
@@ -27,9 +27,9 @@ bq_char = {
 dq_string = @{ (!("\"") ~ dq_char )* }
 sq_string = @{ (!("\'") ~ sq_char )* }
 bq_string = @{ (!("`") ~ bq_char )* }
-double_quoted_string  = _{ "\"" ~ dq_string ~ "\""}
-single_quoted_string  = _{ "\'" ~ sq_string ~ "\'"}
-backquoted_quoted_string  = _{ "`" ~ bq_string ~ "`"}
+double_quoted_string  = ${ "\"" ~ dq_string ~ "\""}
+single_quoted_string  = ${ "\'" ~ sq_string ~ "\'"}
+backquoted_quoted_string  = ${ "`" ~ bq_string ~ "`"}
 
 string = _{
     double_quoted_string |