From bed9aced5f4d745d74ffff1c10b6dc4acef8129e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Wed, 5 Jan 2022 10:58:12 +0900 Subject: [PATCH] Revert "Convert Windows style path separator in completers to Unix style (#1389)" This reverts commit 49444f9c0569a070ffd3c82cee6146656a0ac63c. --- helix-term/src/ui/mod.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs index 9bf888401..9e096311f 100644 --- a/helix-term/src/ui/mod.rs +++ b/helix-term/src/ui/mod.rs @@ -313,7 +313,7 @@ pub mod completers { 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 mut path = if is_tilde { @@ -331,12 +331,7 @@ pub mod completers { path.push(""); } - let path = if cfg!(windows) && is_dir { - // Convert Windows style path separator to Unix style - path.to_str().unwrap().replace("\\", "/") - } else { - path.to_str().unwrap().to_owned() - }; + let path = path.to_str().unwrap().to_owned(); Some((end.clone(), Cow::from(path))) }) }) // TODO: unwrap or skip