Skip to content

Ignore wikilink markers split across inline code spans #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cosmic-Game-studios wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ignore wikilink markers split across inline code spans #451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions src/vault/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,16 @@ pub trait Rangeable {
&& (range.end.line > position.line
|| (range.end.line == position.line && range.end.character >= position.character))
}

fn overlaps(&self, other: &impl Rangeable) -> bool {
let self_range = self.range();
let other_range = other.range();
let before = |left: Position, right: Position| {
left.line < right.line || (left.line == right.line && left.character < right.character)
};

before(self_range.start, other_range.end) && before(other_range.start, self_range.end)
}
}

impl Rangeable for MDHeading {
Expand Down Expand Up @@ -861,6 +871,8 @@ impl Reference {
.unwrap()
}); // A [[link]] that does not have any [ or ] in it

let code_blocks = MDCodeBlock::new(text).collect_vec();

let wiki_links = WIKI_LINK_RE
.captures_iter(text)
.filter(|captures| {
Expand All @@ -872,6 +884,11 @@ impl Reference {
.flat_map(RegexTuple::new)
.flat_map(|regextuple| {
generic_link_constructor::<WikiReferenceConstructor>(text, file_name, regextuple)
})
.filter(move |reference| {
!code_blocks.iter().any(|codeblock| {
codeblock.overlaps(reference) && !codeblock.includes(reference)
})
});

static MD_LINK_RE: Lazy<Regex> = Lazy::new(|| {
Expand Down Expand Up @@ -3213,6 +3230,16 @@ Continued

assert_eq!(parsed, expected);
}

#[test]
fn parse_wikilink_markers_in_separate_inline_code_spans() {
let text = r#"* DO NOT use the square bracket `[[` and `]]` markers"#;

let parsed = Reference::new(text, "test.md").collect_vec();

assert_eq!(parsed, Vec::<Reference>::new());
}

#[test]
fn parse_url_encoded_link() {
let text = " [f](file%20with%20spaces)";
Expand Down