WIP: make the parser actually advance in tags

Author: lolbinarycat

src/librustdoc/passes/lint/html_tags.rs

@@ -165,7 +165,7 @@ pub(crate) fn visit_item(cx: &DocContext<'_>, item: &Item, hir_id: HirId, dox: &
         if !tagp.tag_name.is_empty() {
             report_diag(format!("incomplete HTML tag `{}`", &tagp.tag_name), &(tagp.tag_start_pos..dox.len()), false);
         }
-        for (tag, range) in tagp.tags.iter().filter(|(t, range)| {
+        for (tag, range) in tagp.tags.iter().filter(|(t, _)| {
             let t = t.to_lowercase();
             !is_implicitly_self_closing(&t)
         }) {
@@ -347,6 +347,7 @@ 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() {
                 // Checking if this is a closing tag (like `</a>` for `<a>`).
@@ -441,6 +442,9 @@ impl TagParser {
                     } else if self.quote.is_none() {
                         self.after_eq = false;
                     }
+                    if !is_self_closing && !self.tag_name.is_empty() {
+                        iter.next();
+                    }
                 }
                 // if we've run out of text but still haven't found a `>`,
                 // return early without calling `tag_parsed` or emitting lints.
@@ -539,7 +543,7 @@ fn test_extract_tags_nested_unclosed() {
     use std::cell::RefCell;
 
     let mut tagp = TagParser::new();
-    let mut diags = RefCell::new(Vec::new());
+    let diags = RefCell::new(Vec::new());
     let dox = "<div>\n<br</div>";
     tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
         diags.borrow_mut().push((s, r.clone(), b));
@@ -553,7 +557,7 @@ fn test_extract_tags_taglike_in_attr() {
     use std::cell::RefCell;
 
     let mut tagp = TagParser::new();
-    let mut diags = RefCell::new(Vec::new());
+    let diags = RefCell::new(Vec::new());
     let dox = "<img src='<div>'>";
     tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
         diags.borrow_mut().push((s, r.clone(), b));
@@ -566,24 +570,26 @@ fn test_extract_tags_taglike_in_multiline_attr() {
     use std::cell::RefCell;
 
     let mut tagp = TagParser::new();
-    let mut diags = RefCell::new(Vec::new());
+    let diags = RefCell::new(Vec::new());
     let dox = "<img src=\"\nasd\n<div>\n\">";
     tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
         diags.borrow_mut().push((s, r.clone(), b));
     });
     assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
 }
 
-/*#[test]
+#[test]
 fn test_extract_tags_taglike_in_multievent_attr() {
     use std::cell::RefCell;
 
     let mut tagp = TagParser::new();
-    let mut diags = RefCell::new(Vec::new());
+    let diags = RefCell::new(Vec::new());
     let dox = "<img src='<div>'>";
     let split_point = 10;
-    tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
+    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));
     });
+    p(0..split_point);
+    p(split_point..dox.len());
     assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
-}*/
+}