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

helix-editor · Dec 29, 2021 · 49444f9 · 49444f9
1 parent 8c29b76
commit 49444f9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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,7 +331,12 @@ pub mod completers {
                         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)))
                 })
             }) // TODO: unwrap or skip