Discard markdown::Highlighter if language changes

iced-rs · Jan 31, 2025 · 447f5ae · 447f5ae
1 parent 095859e
commit 447f5ae
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
@@ -289,6 +289,7 @@ struct State {
 #[derive(Debug)]
 struct Highlighter {
     lines: Vec<(String, Vec<Span>)>,
+    language: String,
     parser: iced_highlighter::Stream,
     current: usize,
 }
@@ -304,6 +305,7 @@ impl Highlighter {
                     token: language.to_string(),
                 },
             ),
+            language: language.to_owned(),
             current: 0,
         }
     }
@@ -484,6 +486,9 @@ fn parse_with<'a>(
                             .borrow_mut()
                             .highlighter
                             .take()
+                            .filter(|highlighter| {
+                                highlighter.language == _language.as_ref()
+                            })
                             .unwrap_or_else(|| Highlighter::new(&_language));
 
                         highlighter.prepare();