bed9ace · helix · git.iko.soy

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

This reverts commit 49444f9c0569a070ffd3c82cee6146656a0ac63c.

commitbed9aced5f4d745d74ffff1c10b6dc4acef8129e authorBlaž Hrastnik <blaz@mxxn.io> dateWed 5 Jan 2022, 10:58 (5 years ago) parentbd0d20a

1 file changed+2−7

unifiedsplit

helix-term/src/ui/mod.rs+2−7

@@ -313,7 +313,7 @@ pub mod completers {

313313 return None;

314314 }

315315

316− let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());

316+ //let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());

317317

318318 let path = entry.path();

319319 let mut path = if is_tilde {

@@ -331,12 +331,7 @@ pub mod completers {

331331 path.push("");

332332 }

333333

334− let path = if cfg!(windows) && is_dir {

335− // Convert Windows style path separator to Unix style

336− path.to_str().unwrap().replace("\\", "/")

337− } else {

338− path.to_str().unwrap().to_owned()

339− };

334+ let path = path.to_str().unwrap().to_owned();

340335 Some((end.clone(), Cow::from(path)))

341336 })

342337 }) // TODO: unwrap or skip