fix: normalize path separators for keyword matching on Windows
This commit is contained in:
parent
67ca1bc959
commit
a2d981aff9
|
|
@ -83,7 +83,10 @@ impl<'a> Stream<'a> {
|
||||||
None => return true,
|
None => return true,
|
||||||
};
|
};
|
||||||
|
|
||||||
let path = util::to_lowercase(path);
|
let mut path = util::to_lowercase(path);
|
||||||
|
if cfg!(windows) {
|
||||||
|
path = path.replace('\\', "/");
|
||||||
|
}
|
||||||
let mut path = path.as_str();
|
let mut path = path.as_str();
|
||||||
match path.rfind(keywords_last) {
|
match path.rfind(keywords_last) {
|
||||||
Some(idx) => {
|
Some(idx) => {
|
||||||
|
|
@ -202,6 +205,9 @@ mod tests {
|
||||||
#[case(&["foo", "o", "bar"], "/foo/bar", false)]
|
#[case(&["foo", "o", "bar"], "/foo/bar", false)]
|
||||||
#[case(&["/foo/", "/bar"], "/foo/bar", false)]
|
#[case(&["/foo/", "/bar"], "/foo/bar", false)]
|
||||||
#[case(&["/foo/", "/bar"], "/foo/baz/bar", true)]
|
#[case(&["/foo/", "/bar"], "/foo/baz/bar", true)]
|
||||||
|
// Forward slash matching on Windows-style paths
|
||||||
|
#[case(&["bar/meow"], r"~\foo\bar\meow", true)]
|
||||||
|
#[case(&["bar", "meow"], r"~\foo\bar\meow", true)]
|
||||||
fn query(#[case] keywords: &[&str], #[case] path: &str, #[case] is_match: bool) {
|
fn query(#[case] keywords: &[&str], #[case] path: &str, #[case] is_match: bool) {
|
||||||
let db = &mut Database::new(PathBuf::new(), Vec::new(), |_| Vec::new(), false);
|
let db = &mut Database::new(PathBuf::new(), Vec::new(), |_| Vec::new(), false);
|
||||||
let options = StreamOptions::new(0).with_keywords(keywords.iter());
|
let options = StreamOptions::new(0).with_keywords(keywords.iter());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue