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
13 changes: 4 additions & 9 deletions src/parser/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,11 @@ impl<'a> Parser<'a> {

if self
.stream
.slice_len(idx, constants::COMMENT.len())
.eq(constants::COMMENT)
.slice_len(idx, constants::COMMENT_END.len())
.eq(constants::COMMENT_END)
{
self.stream.advance_by(constants::COMMENT.len());

let is_end_of_comment = self.stream.expect_and_skip_cond(b'>');

if is_end_of_comment {
return self.stream.slice(start, self.stream.idx);
}
self.stream.advance_by(constants::COMMENT_END.len());
return self.stream.slice(start, self.stream.idx);
}

self.stream.advance();
Expand Down
1 change: 1 addition & 0 deletions src/parser/constants.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub const COMMENT: &[u8; 2] = b"--";
pub const COMMENT_END: &[u8; 3] = b"-->";
pub const VOID_TAGS: &[&[u8]; 15] = &[
b"area", b"base", b"br", b"col", b"embed", b"hr", b"img", b"input", b"keygen", b"link",
b"meta", b"param", b"source", b"track", b"wbr",
Expand Down
11 changes: 11 additions & 0 deletions src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,17 @@ fn comment() {
);
}

#[test]
fn odd_dash_comment_regression() {
let dom = parse("<!-- test --->", Default::default()).unwrap();
let nodes = dom.nodes();
assert_eq!(nodes.len(), 1);
assert_eq!(
nodes[0].as_comment().unwrap().as_utf8_str(),
"<!-- test --->"
);
}

#[test]
fn tag_all_children() {
fn assert_len(input: &str, len: usize) {
Expand Down