fix: #38 - Fix reference links disappearing when appearing anywhere after a table.

Author: dsherret

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "dprint-plugin-markdown"
 description = "Markdown formatter for dprint."
-version = "0.6.0"
+version = "0.6.1"
 authors = ["David Sherret <[email protected]>"]
 license = "MIT"
 edition = "2018"

Cargo.toml

@@ -8,6 +8,7 @@ struct EventIterator<'a> {
     last_range: Range,
     next: Option<(Event<'a>, Range)>,
     allow_empty_text_events: bool,
+    in_table_count: i8,
 }
 
 impl<'a> EventIterator<'a> {
@@ -23,22 +24,23 @@ impl<'a> EventIterator<'a> {
             },
             next,
             allow_empty_text_events: false,
+            in_table_count: 0,
         }
     }
 
     pub fn next(&mut self) -> Option<Event<'a>> {
         if let Some((event, range)) = self.next.take() {
             // println!("{:?} {:?}", range, event);
             self.last_range = range;
-            self.next = self.iterator.next();
+            self.next = self.move_iterator_next();
 
             if !self.allow_empty_text_events {
                 // skip over any empty text or html events
                 loop {
                     match &self.next {
                         Some((Event::Text(text), _)) | Some((Event::Html(text), _)) => {
                             if text.trim().is_empty() {
-                                self.next = self.iterator.next();
+                                self.next = self.move_iterator_next();
                             } else {
                                 break;
                             }
@@ -54,6 +56,22 @@ impl<'a> EventIterator<'a> {
         }
     }
 
+    fn move_iterator_next(&mut self) -> Option<(Event<'a>, Range)> {
+        let next = self.iterator.next();
+
+        match next {
+            Some((Event::Start(Tag::Table(_)), _)) => self.in_table_count += 1,
+            Some((Event::End(Tag::Table(_)), _)) => self.in_table_count -= 1,
+            _ => {}
+        }
+
+        next
+    }
+
+    pub fn is_in_table(&self) -> bool {
+        self.in_table_count > 0
+    }
+
     pub fn start(&self) -> usize {
         self.last_range.start
     }
@@ -91,19 +109,12 @@ pub fn parse_cmark_ast(markdown_text: &str) -> Result<SourceFile, ParseError> {
     let mut children: Vec<Node> = Vec::new();
     let mut iterator = EventIterator::new(markdown_text, Parser::new_ext(markdown_text, options).into_offset_iter());
     let mut last_event_range: Option<Range> = None;
-    let mut is_in_table = 0;
 
     while let Some(event) = iterator.next() {
-        match event {
-            Event::Start(Tag::Table(_)) => is_in_table += 1,
-            Event::End(Tag::Table(_)) => is_in_table += 1,
-            _ => {}
-        }
-
         let current_range = iterator.get_last_range();
 
         // do not parse for link references while inside a table
-        if is_in_table == 0 {
+        if !iterator.is_in_table() {
             if let Some(references) = parse_references(&last_event_range, current_range.start, &mut iterator)? {
                 children.push(references);
             }

src/parsing/cmark/parse_cmark_ast.rs

@@ -0,0 +1,38 @@
+!! should handle reference links not at the end of the file !!
+
+# Test
+
+| Company                    |
+| -------------------------- |
+| [GitHub][github]           |
+| [Google][google]           |
+| [Amazon Web Services][aws] |
+
+[github]: https://github.com
+
+test
+
+[google]: https://google.com
+
+A paragraph.
+
+[aws]: https://aws.amazon.com
+
+[expect]
+# Test
+
+| Company                    |
+| -------------------------- |
+| [GitHub][github]           |
+| [Google][google]           |
+| [Amazon Web Services][aws] |
+
+[github]: https://github.com
+
+test
+
+[google]: https://google.com
+
+A paragraph.
+
+[aws]: https://aws.amazon.com