From 90640d4e5178bbbd3115ba2a7870860c25cb68d5 Mon Sep 17 00:00:00 2001 From: Justine Date: Sat, 4 Feb 2023 23:45:43 +0100 Subject: [PATCH] Fixed additionnal space in command autocomplete --- src/shell/autocomplete.rs | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/shell/autocomplete.rs b/src/shell/autocomplete.rs index 29cdf73..d84a396 100644 --- a/src/shell/autocomplete.rs +++ b/src/shell/autocomplete.rs @@ -94,13 +94,20 @@ impl Search { } }; - let xxx = &self.search_path.clone().into_os_string().into_string().unwrap(); - if !&self.local_search && !res.contains(&xxx.as_str()) { - let return_val = format!("{} {}{}", &self.command, &self.search_path.display(), res); - return(return_val, res_lines); - } else { - let return_val = format!("{} {}", &self.command, res); - return(return_val, res_lines); + match &self.search_type { + SearchType::FileSearch => { + let xxx = &self.search_path.clone().into_os_string().into_string().unwrap(); + if !&self.local_search && !res.contains(&xxx.as_str()) { + let return_val = format!("{} {}{}", &self.command, &self.search_path.display(), res); + return(return_val, res_lines); + } else { + let return_val = format!("{} {}", &self.command, res); + return(return_val, res_lines); + } + }, + SearchType::CmdSearch => { + return (res, res_lines); + }, } }