andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-23 01:46:18 +04:00
Code Issues Projects Releases Wiki Activity

Revert "Convert Windows style path separator in completers to Unix style (#1389)"

Browse Source 
This reverts commit 49444f9c05.
This commit is contained in:
Blaž Hrastnik 2022-01-05 10:58:12 +09:00
parent bd0d20a2b3
commit bed9aced5f
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helix-term/src/ui/mod.rs
View File

@ -313,7 +313,7 @@ fn filename_impl<F>(input: &str, filter_fn: F) -> Vec<Completion>
return None; return None;
} }
let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir()); //let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
let path = entry.path(); let path = entry.path();
let mut path = if is_tilde { let mut path = if is_tilde {
@ -331,12 +331,7 @@ fn filename_impl<F>(input: &str, filter_fn: F) -> Vec<Completion>
path.push(""); path.push("");
} }
let path = if cfg!(windows) && is_dir { let path = path.to_str().unwrap().to_owned();
// Convert Windows style path separator to Unix style
path.to_str().unwrap().replace("\\", "/")
} else {
path.to_str().unwrap().to_owned()
};
Some((end.clone(), Cow::from(path))) Some((end.clone(), Cow::from(path)))
}) })
}) // TODO: unwrap or skip }) // TODO: unwrap or skip