From 36f5888da45e00a18dd0993086694923d4c03d4d Mon Sep 17 00:00:00 2001
From: Builditluc <37375448+Builditluc@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:42:47 +0100
Subject: [PATCH] fix: add whitespace if the previous element is a list marker

---
 src/ui/article/lines.rs | 10 +++++++++-
 src/wiki/article.rs     |  1 +
 src/wiki/parser.rs      |  4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ui/article/lines.rs b/src/ui/article/lines.rs
index 97b4b0e9..f5ef63fe 100644
--- a/src/ui/article/lines.rs
+++ b/src/ui/article/lines.rs
@@ -143,6 +143,8 @@ impl LinesWrapper {
     pub fn wrap_lines(mut self) -> Self {
         debug!("wrapping the lines");
 
+        let mut last_type: ElementType = ElementType::Text;
+
         // go through every element
         for element in self.elements.clone().iter() {
             // is this a link?
@@ -156,6 +158,8 @@ impl LinesWrapper {
                 // fill the current line and make the next one blank
                 self.fill_line();
                 self.newline();
+
+                last_type = element.kind();
                 continue;
             }
 
@@ -176,7 +180,9 @@ impl LinesWrapper {
 
             // if the element does not have a leading special character and we are not at the beginning
             // of a line, add a leading whitespace
-            if !element.content().starts_with([',', '.', ';', ':']) && !self.current_line.is_empty()
+            if (!element.content().starts_with([',', '.', ';', ':'])
+                && !self.current_line.is_empty())
+                || last_type == ElementType::ListMarker
             {
                 self.push_whitespace();
             }
@@ -190,6 +196,7 @@ impl LinesWrapper {
                     }
                     // then add it to the merged element
                     merged_element.push_str(span);
+                    last_type = element.kind();
                     continue;
                 }
 
@@ -228,6 +235,7 @@ impl LinesWrapper {
                     }
                     // then add it to the merged element
                     merged_element.push_str(span);
+                    last_type = element.kind();
                     continue;
                 }
             }
diff --git a/src/wiki/article.rs b/src/wiki/article.rs
index f098ca86..324fcb81 100644
--- a/src/wiki/article.rs
+++ b/src/wiki/article.rs
@@ -30,6 +30,7 @@ pub enum ElementType {
     Link,
     Header,
     Unsupported,
+    ListMarker,
 }
 
 #[derive(Debug, Clone)]
diff --git a/src/wiki/parser.rs b/src/wiki/parser.rs
index 61b388eb..dde0564f 100644
--- a/src/wiki/parser.rs
+++ b/src/wiki/parser.rs
@@ -183,8 +183,8 @@ impl Parser {
 
             self.elements.push(Element::new(
                 self.next_id(),
-                ElementType::Text,
-                format!("\t{}", LIST_MARKER),
+                ElementType::ListMarker,
+                format!("\t{} ", LIST_MARKER),
                 self.combine_effects(Style::from(config::CONFIG.theme.text)),
                 HashMap::new(),
             ));