minor updates on path completion

mitnk · Nov 10, 2018 · afa0de5 · afa0de5
1 parent 5f14848
commit afa0de5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/completers/path.rs b/src/completers/path.rs
@@ -146,14 +146,19 @@ pub fn complete_path(buffer: &str, for_dir: bool) -> Vec<Completion> {
                             name = str::replace(&name, "\'", "\\\'");
                             name = str::replace(&name, "*", "\\*");
                         }
+                        let mut quoted = false;
+                        if !path_sep.is_empty() {
+                            name = tools::wrap_sep_string(&path_sep, &name);
+                            quoted = true;
+                        }
                         let suffix = if is_dir {
+                            if quoted {
+                                name = name.trim_end_matches(&path_sep).to_string();
+                            }
                             Suffix::Some(MAIN_SEPARATOR)
                         } else {
                             Suffix::Default
                         };
-                        if !path_sep.is_empty() {
-                            name = tools::wrap_sep_string(&path_sep, &name);
-                        }
                         res.push(Completion {
                             completion: name,
                             display,