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
45 changes: 43 additions & 2 deletions src/vault/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,17 @@ 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();

(self_range.start.line < other_range.end.line
|| (self_range.start.line == other_range.end.line
&& self_range.start.character < other_range.end.character))
&& (other_range.start.line < self_range.end.line
|| (other_range.start.line == self_range.end.line
&& other_range.start.character < self_range.end.character))
}
}

impl Rangeable for MDHeading {
Expand Down Expand Up @@ -672,7 +683,7 @@ impl MDFile {
references_in_codeblocks: false,
..
} => Reference::new(text, file_name)
.filter(|it| !code_blocks.iter().any(|codeblock| codeblock.includes(it)))
.filter(|it| !code_blocks.iter().any(|codeblock| codeblock.overlaps(it)))
.collect_vec(),
_ => Reference::new(text, file_name).collect_vec(),
};
Expand Down Expand Up @@ -1798,7 +1809,8 @@ mod vault_tests {
use itertools::Itertools;
use tower_lsp::lsp_types::{Position, Range};

use crate::vault::{HeadingLevel, MyRange, ReferenceData};
use crate::config::Settings;
use crate::vault::{HeadingLevel, ReferenceData};
use crate::vault::{MDLinkReferenceDefinition, Refname};

use super::Reference::*;
Expand Down Expand Up @@ -1860,6 +1872,35 @@ mod vault_tests {
assert_eq!(parsed, expected)
}

#[test]
fn references_overlapping_inline_code_are_ignored() {
let text = "* DO NOT use the square bracket `[[` and `]]` markers\n[[real link]]";
let settings = Settings::new(
Path::new("."),
&tower_lsp::lsp_types::ClientCapabilities::default(),
)
.unwrap();
let parsed = MDFile::new(&settings, text, "test.md".into());

let expected = vec![WikiFileLink(ReferenceData {
reference_text: "real link".into(),
range: tower_lsp::lsp_types::Range {
start: tower_lsp::lsp_types::Position {
line: 1,
character: 0,
},
end: tower_lsp::lsp_types::Position {
line: 1,
character: 13,
},
}
.into(),
..ReferenceData::default()
})];

assert_eq!(parsed.references, expected)
}

#[test]
fn wiki_link_heading_parsing() {
let text = "This is a [[link#heading]]";
Expand Down