diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/bold.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/bold.rs index 56bd09c3..9641f77b 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/bold.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/bold.rs @@ -5,7 +5,7 @@ use gtk::{ }; use regex::Regex; -const REGEX_BOLD: &str = r"\*\*(?P[^*]+)\*\*"; +const REGEX_BOLD: &str = r"\*\*(?P[^\*]*)\*\*"; pub struct Bold(TextTag); diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/header.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/header.rs index e399d92c..681d73ae 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/header.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/header.rs @@ -112,19 +112,6 @@ impl Header { let mut start_iter = buffer.iter_at_offset(start_char_offset); let mut end_iter = buffer.iter_at_offset(end_char_offset); - // Skip escaped entries - if start_char_offset > 0 - && buffer - .text( - &buffer.iter_at_offset(start_char_offset - 1), - &end_iter, - false, - ) - .contains("\\") - { - continue; - } - // Create unique phantom tag for each header // * for the #fragment references implementation let h = TextTag::new(Some(&format!("h{}", gtk::glib::uuid_string_random()))); diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/list.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/list.rs index 304167c8..fc142275 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/list.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/list.rs @@ -61,18 +61,6 @@ pub fn render(buffer: &TextBuffer) { let mut start_iter = buffer.iter_at_offset(start_char_offset); let mut end_iter = buffer.iter_at_offset(end_char_offset); - if start_char_offset > 0 - && buffer - .text( - &buffer.iter_at_offset(start_char_offset - 1), - &end_iter, - false, - ) - .contains("\\") - { - continue; - } - buffer.delete(&mut start_iter, &mut end_iter); let item = Item::parse( diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/pre.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/pre.rs index 473067dc..0ff09dc0 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/pre.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/pre.rs @@ -6,7 +6,7 @@ use gtk::{ }; use regex::Regex; -const REGEX_PRE: &str = r"`(?P[^`]+)`"; +const REGEX_PRE: &str = r"`(?P[^`]*)`"; const TAG_FONT: &str = "monospace"; // @TODO const TAG_SCALE: f64 = 0.9; diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/quote.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/quote.rs index e7a79849..cd011fd7 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/quote.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/quote.rs @@ -42,18 +42,6 @@ impl Quote { let mut start_iter = buffer.iter_at_offset(start_char_offset); let mut end_iter = buffer.iter_at_offset(end_char_offset); - if start_char_offset > 0 - && buffer - .text( - &buffer.iter_at_offset(start_char_offset - 1), - &end_iter, - false, - ) - .contains("\\") - { - continue; - } - buffer.delete(&mut start_iter, &mut end_iter); buffer.insert_with_tags(&mut start_iter, &cap["text"], &[&self.0]) } @@ -63,7 +51,7 @@ impl Quote { #[test] fn test_regex() { let cap: Vec<_> = Regex::new(REGEX_QUOTE).unwrap().captures_iter( - "> Some quote 1 with ![img](https://link.com)\n> Some quote 2 with text\nplain text\n> Some quote 3" + "> Some quote 1 with ![img](https://link.com)\n> 2\\)Some quote 2 with text\nplain text\n> Some quote 3" ).collect(); { let m = cap.first().unwrap(); @@ -71,7 +59,7 @@ fn test_regex() { } { let m = cap.get(1).unwrap(); - assert_eq!(&m["text"], "Some quote 2 with text"); + assert_eq!(&m["text"], "2\\)Some quote 2 with text"); } { let m = cap.get(2).unwrap(); diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/strike.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/strike.rs index 13b4ef08..7c0efb71 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/strike.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/strike.rs @@ -5,7 +5,7 @@ use gtk::{ }; use regex::Regex; -const REGEX_STRIKE: &str = r"~~(?P.+?)~~"; +const REGEX_STRIKE: &str = r"~~(?P[^~]*)~~"; pub struct Strike(TextTag); diff --git a/src/app/browser/window/tab/item/page/content/text/markdown/tags/underline.rs b/src/app/browser/window/tab/item/page/content/text/markdown/tags/underline.rs index fe7dbd3f..9357208a 100644 --- a/src/app/browser/window/tab/item/page/content/text/markdown/tags/underline.rs +++ b/src/app/browser/window/tab/item/page/content/text/markdown/tags/underline.rs @@ -6,7 +6,7 @@ use gtk::{ }; use regex::Regex; -const REGEX_UNDERLINE: &str = r"\b_(?P[^_]+)_\b"; +const REGEX_UNDERLINE: &str = r"\b_(?P[^_]*)_\b"; pub struct Underline(TextTag);