raw_str function to generate non parsed text

Canop · Mar 9, 2023 · e857aec · e857aec
1 parent b7a4b0e
commit e857aec
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minimad"
-version = "0.11.0"
+version = "0.12.0"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 repository = "https://github.com/Canop/minimad"
 description = "light Markdown parser"

diff --git a/src/markdown/composite.rs b/src/markdown/composite.rs
@@ -6,7 +6,7 @@ use crate::*;
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum CompositeStyle {
     Paragraph,
-    Header(u8), // never 0, and <= MAX_HEADER_DEPTH
+    Header(u8),   // never 0, and <= MAX_HEADER_DEPTH
     ListItem(u8), // can't be built > 3 by parsing
     Code,
     Quote,
@@ -48,6 +48,12 @@ impl<'a> Composite<'a> {
     pub fn from_inline(md: &'a str) -> Composite<'a> {
         parser::LineParser::from(md).inline()
     }
+    pub fn raw_str(s: &'a str) -> Composite<'a> {
+        Self {
+            style: CompositeStyle::Paragraph,
+            compounds: vec![Compound::raw_str(s)],
+        }
+    }
     #[inline(always)]
     pub fn is_code(&self) -> bool {
         matches!(self.style, CompositeStyle::Code { .. })

diff --git a/src/markdown/line.rs b/src/markdown/line.rs
@@ -12,10 +12,13 @@ pub enum Line<'a> {
     CodeFence(Composite<'a>),
 }
 
-impl Line<'_> {
-    pub fn from(md: &str) -> Line<'_> {
+impl<'a> Line<'a> {
+    pub fn from(md: &'a str) -> Self {
         parser::LineParser::from(md).line()
     }
+    pub fn raw_str(s: &'a str) -> Self {
+        Self::Normal(Composite::raw_str(s))
+    }
     #[inline(always)]
     pub fn char_length(&self) -> usize {
         match self {
@@ -54,7 +57,10 @@ impl Line<'_> {
             compounds,
         })
     }
-    pub fn new_list_item(depth: u8, compounds: Vec<Compound<'_>>) -> Line<'_> {
+    pub fn new_list_item(
+        depth: u8,
+        compounds: Vec<Compound<'_>>,
+    ) -> Line<'_> {
         Line::Normal(Composite {
             style: CompositeStyle::ListItem(depth),
             compounds,

diff --git a/src/markdown/text.rs b/src/markdown/text.rs
@@ -27,4 +27,8 @@ impl<'s> Text<'s> {
     {
         crate::parser::parse_lines(md_lines, Options::default())
     }
+    pub fn raw_str(s: &'s str) -> Self {
+        let lines = s.lines().map(|line| Line::raw_str(line)).collect();
+        Self { lines }
+    }
 }
diff --git a/src/parser/line_parser.rs b/src/parser/line_parser.rs
@@ -494,34 +494,41 @@ mod tests {
     fn list_item() {
         assert_eq!(
             Line::from("* *list* item"),
-            Line::new_list_item(0, vec![
-                Compound::raw_str("list").italic(),
-                Compound::raw_str(" item"),
-            ])
+            Line::new_list_item(
+                0,
+                vec![
+                    Compound::raw_str("list").italic(),
+                    Compound::raw_str(" item"),
+                ]
+            )
         );
     }
 
     #[test]
     fn deep_list_items() {
         assert_eq!(
             Line::from(" * *list* item"),
-            Line::new_list_item(1, vec![
-                Compound::raw_str("list").italic(),
-                Compound::raw_str(" item"),
-            ])
+            Line::new_list_item(
+                1,
+                vec![
+                    Compound::raw_str("list").italic(),
+                    Compound::raw_str(" item"),
+                ]
+            )
         );
         assert_eq!(
             Line::from("  * deeper"),
-            Line::new_list_item(2, vec![
-                Compound::raw_str("deeper"),
-            ])
+            Line::new_list_item(2, vec![Compound::raw_str("deeper"),])
         );
         assert_eq!(
             Line::from("   * even **deeper**"),
-            Line::new_list_item(3, vec![
-                Compound::raw_str("even "),
-                Compound::raw_str("deeper").bold(),
-            ])
+            Line::new_list_item(
+                3,
+                vec![
+                    Compound::raw_str("even "),
+                    Compound::raw_str("deeper").bold(),
+                ]
+            )
         );
         assert_eq!(
             Line::from("    * but not this one..."),