kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
ath3 2021-12-29 16:30:20 +01:00 • committed by GitHub
parent 8c29b76bcc
commit 49444f9c05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 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 @@ pub mod completers {
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,7 +331,12 @@ pub mod completers {
path.push(""); path.push("");
} }
let path = path.to_str().unwrap().to_owned(); 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()
};
Some((end.clone(), Cow::from(path))) Some((end.clone(), Cow::from(path)))
}) })
}) // TODO: unwrap or skip }) // TODO: unwrap or skip