Skip to content
Open
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
32 changes: 30 additions & 2 deletions crates/mdbook-driver/src/builtin_preprocessors/links/take_lines.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use mdbook_core::static_regex;
use std::ops::Bound::{Excluded, Included, Unbounded};
use std::ops::RangeBounds;
use tracing::warn;

/// Take a range of lines from a string.
pub(super) fn take_lines<R: RangeBounds<usize>>(s: &str, range: R) -> String {
Expand Down Expand Up @@ -41,7 +42,15 @@ pub(super) fn take_anchored_lines(s: &str, anchor: &str) -> String {
}
}
None => {
if !ANCHOR_START.is_match(l) {
if let Some(cap) = ANCHOR_START.captures(l) {
if &cap["anchor_name"] == anchor {
warn!(
"duplicate ANCHOR start `{anchor}` without a matching \
`ANCHOR_END: {anchor}`; anchor regions must be closed with \
ANCHOR_END"
);
}
} else {
retained.push(l);
}
}
Expand Down Expand Up @@ -91,7 +100,15 @@ pub(super) fn take_rustdoc_include_anchored_lines(s: &str, anchor: &str) -> Stri
}
}
None => {
if !ANCHOR_START.is_match(l) {
if let Some(cap) = ANCHOR_START.captures(l) {
if &cap["anchor_name"] == anchor {
warn!(
"duplicate ANCHOR start `{anchor}` without a matching \
`ANCHOR_END: {anchor}`; anchor regions must be closed with \
ANCHOR_END"
);
}
} else {
output.push_str(l);
output.push('\n');
}
Expand Down Expand Up @@ -250,4 +267,15 @@ mod tests {
"# Lorem\nipsum\n# dolor\nsit\n# amet"
);
}

#[test]
fn duplicate_anchor_start_does_not_close_region() {
let closed = "ANCHOR: all\nstruct\nANCHOR_END: all\ntrailing";
let duplicate_start = "ANCHOR: all\nstruct\nANCHOR: all\ntrailing";
assert_eq!(take_anchored_lines(closed, "all"), "struct");
assert_eq!(
take_anchored_lines(duplicate_start, "all"),
"struct\ntrailing"
);
}
}
Loading