more unit tests and assertions

Author: lolbinarycat

src/librustdoc/passes/lint/html_tags.rs

@@ -247,6 +247,7 @@ fn is_valid_for_html_tag_name(c: char, is_empty: bool) -> bool {
 }
 
 /// Parse html tags to ensure they are well-formed
+#[derive(Debug, Clone)]
 struct TagParser {
     tags: Vec<(String, Range<usize>)>,
     /// Name of the tag that is being parsed, if we are within a tag.
@@ -347,9 +348,8 @@ impl TagParser {
                 None if self.tag_name.is_empty() => (prev_pos, '\0'),
                 None => break,
             };
-            dbg!(pos, c, &self.in_attrs, &self.tag_name);
             prev_pos = pos;
-            if !self.in_attrs && c == '/' && self.tag_name.is_empty() {
+            if c == '/' && self.tag_name.is_empty() {
                 // Checking if this is a closing tag (like `</a>` for `<a>`).
                 self.is_closing = true;
             } else if !self.in_attrs && is_valid_for_html_tag_name(c, self.tag_name.is_empty()) {
@@ -364,6 +364,7 @@ impl TagParser {
                         r.end += 1;
                     }
                     if self.is_closing {
+                        assert!(self.quote.is_none() && self.quote_pos.is_none() && !self.after_eq, "inconsistent state for closing tag: {self:?}");
                         // In case we have "</div >" or even "</div         >".
                         if c != '>' {
                             if !c.is_whitespace() {
@@ -416,6 +417,7 @@ impl TagParser {
             'parse_til_gt: {
                 for (i, c) in text[pos..].char_indices() {
                     if !c.is_whitespace() {
+                        assert_eq!(self.quote_pos.is_some(), self.quote.is_some());
                         if let Some(q) = self.quote {
                             if c == q {
                                 self.quote = None;
@@ -486,7 +488,7 @@ impl TagParser {
         let mut prev_pos = 0;
         loop {
             if self.quote.is_some() {
-                assert!(self.in_attrs);
+                assert!(self.in_attrs && self.quote_pos.is_some());
             }
             if self.in_attrs &&
                 let Some(&(start_pos, _)) = iter.peek()
@@ -593,3 +595,24 @@ fn test_extract_tags_taglike_in_multievent_attr() {
     p(split_point..dox.len());
     assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
 }
+
+#[test]
+fn test_extract_tags_taglike_in_multiline_multievent_attr() {
+    use std::cell::RefCell;
+
+    let mut tagp = TagParser::new();
+    let diags = RefCell::new(Vec::new());
+    let dox = "<img src='\n foo:\n </div>\n <p/>\n <div>\n'>";
+    let mut p = |range: Range<usize>| {
+        tagp.extract_tags(&dox[range.clone()], range, &mut None, &|s, r, b| {
+            diags.borrow_mut().push((s, r.clone(), b));
+        })};
+    let mut offset = 0;
+    for ln in dox.split_inclusive('\n') {
+        let new_offset = offset + ln.len();
+        p(offset..new_offset);
+        offset = new_offset;
+    }
+    assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
+    assert_eq!(tagp.tags.len(), 1);
+}