Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/parser/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,23 @@ impl<'a> Parser<'a> {

fn read_end(&mut self) {
self.stream.advance();
self.skip_whitespaces();

let closing_tag_name = self.read_to(b'>');

self.stream.expect_and_skip_cond(b'>');
if let Some(closing_tag_name) = self.read_ident() {
self.skip_whitespaces();
self.stream.expect_and_skip_cond(b'>');

let closing_tag_matches_parent = self.stack.last()
.and_then(|last_handle| last_handle.get(self))
.and_then(|last_item| last_item.as_tag())
.map_or(false, |last_tag| last_tag.name() == closing_tag_name);
let closing_tag_matches_parent = self
.stack
.last()
.and_then(|last_handle| last_handle.get(self))
.and_then(|last_item| last_item.as_tag())
.map_or(false, |last_tag| last_tag.name() == closing_tag_name);

if !closing_tag_matches_parent {
if !closing_tag_matches_parent {
return;
}
} else {
return;
}

Expand Down
33 changes: 32 additions & 1 deletion src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{parse, parse_owned, Bytes};
use crate::{parse, parse_owned, Bytes, VDom};
use crate::{parser::*, HTMLTag, Node};

fn force_as_tag<'a, 'b>(actual: &'a Node<'b>) -> &'a HTMLTag<'b> {
Expand Down Expand Up @@ -778,3 +778,34 @@ fn tag_raw_abrupt_stop() {
let from_raw = first_tag.raw().try_as_utf8_str().unwrap();
assert_eq!(from_raw, "<p>abcd</p");
}

#[test]
fn line_breaks_inside_tags() {
/// Asserts that the given node is a div with the given text as its only child.
fn assert_div_with_text(node: &NodeHandle, dom: &VDom, text: &[u8]) {
let tag = node.get(dom.parser()).unwrap().as_tag().unwrap();
assert_eq!(&tag._name, "div");
assert_eq!(tag._children.len(), 1);
assert_eq!(
tag._children[0]
.get(dom.parser())
.unwrap()
.as_raw()
.unwrap()
.as_bytes(),
text
);
}

let input = "<div>div 1</div><\ndiv\n>div 2</\ndiv\n><div>div 3</div><div>div 4</div>";
let dom = parse(input, Default::default()).unwrap();
let children = dom.children();

// each of the 4 divs should be a top level child
assert_eq!(children.len(), 4);

assert_div_with_text(&children[0], &dom, b"div 1");
assert_div_with_text(&children[1], &dom, b"div 2");
assert_div_with_text(&children[2], &dom, b"div 3");
assert_div_with_text(&children[3], &dom, b"div 4");
}