fix(templ): fix listsubpages order

mdn · Nov 6, 2024 · 6175e8f · 6175e8f
1 parent 561e925
commit 6175e8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/crates/rari-doc/src/templ/parser.rs b/crates/rari-doc/src/templ/parser.rs
@@ -136,15 +136,6 @@ pub fn parse(input: &str) -> Result<Vec<Token>, DocError> {
     Ok(tokens)
 }
 
-fn _strip_escape_residues(s: &str) -> &str {
-    let s = s.strip_prefix("&gt;").or(s.strip_prefix('>')).unwrap_or(s);
-    let s = s
-        .strip_suffix("!&lt;")
-        .or(s.strip_suffix("!<"))
-        .unwrap_or(s);
-    s
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

diff --git a/crates/rari-doc/src/templ/templs/listsubpages.rs b/crates/rari-doc/src/templ/templs/listsubpages.rs
@@ -31,7 +31,7 @@ pub fn list_sub_pages(
             &mut out,
             url,
             env.locale,
-            Some(SubPagesSorter::SlugNatural),
+            Some(SubPagesSorter::TitleNatural),
             &[],
         )?;
     } else {
@@ -40,7 +40,7 @@ pub fn list_sub_pages(
             url,
             env.locale,
             Some(depth),
-            Some(SubPagesSorter::SlugNatural),
+            Some(SubPagesSorter::TitleNatural),
             &[],
             false,
         )?;

diff --git a/crates/rari-md/src/p.rs b/crates/rari-md/src/p.rs
@@ -1,15 +1,9 @@
 use comrak::nodes::{AstNode, NodeValue};
-use itertools::Itertools;
 
 use crate::ext::{DELIM_END, DELIM_START};
 
 fn only_escaped_templ(b: &[u8], start: usize) -> bool {
-    let b = &b[..b
-        .iter()
-        .rev()
-        .find_position(|c| *c != &b'\n')
-        .map(|(i, _)| b.len() - i)
-        .unwrap_or(0)];
+    let b = b.trim_ascii_end();
     if b[start..].starts_with(DELIM_START.as_bytes()) {
         let start = start + DELIM_START.as_bytes().len();
         if let Some(end) = b[start..]
@@ -58,5 +52,7 @@ mod test {
         assert!(only_escaped_templ(b, 0));
         let b = "⟬0⟭⟬1⟭".as_bytes();
         assert!(only_escaped_templ(b, 0));
+        let b = "⟬0⟭,⟬1⟭".as_bytes();
+        assert!(!only_escaped_templ(b, 0));
     }
 }