Merge branch 'main' into touch

prefix-dev · Sep 28, 2024 · 1e35479 · 1e35479
2 parents 07609d3 + 1113c78
commit 1e35479
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/shell/Cargo.toml b/crates/shell/Cargo.toml
@@ -41,6 +41,7 @@ chrono = "0.4.38"
 parse_datetime = "0.6.0"
 dtparse = "2.0.1"
 windows-sys = "0.59.0"
+ctrlc = "3.4.5"
 
 [package.metadata.release]
 # Dont publish the binary

diff --git a/crates/shell/src/completion.rs b/crates/shell/src/completion.rs
@@ -62,6 +62,9 @@ fn complete_filenames(_is_start: bool, word: &str, matches: &mut Vec<Pair>) {
     // Determine the full directory path to search
     let search_dir = if dir_path.starts_with('/') {
         dir_path.to_string()
+    } else if let Some(stripped) = dir_path.strip_prefix('~') {
+        let home_dir = dirs::home_dir().unwrap();
+        format!("{}{}", home_dir.display(), stripped)
     } else {
         format!("./{}", dir_path)
     };

diff --git a/crates/shell/src/main.rs b/crates/shell/src/main.rs
@@ -32,9 +32,14 @@ fn init_state() -> ShellState {
 async fn interactive() -> anyhow::Result<()> {
     let config = Config::builder()
         .history_ignore_space(true)
-        .completion_type(CompletionType::Circular)
+        .completion_type(CompletionType::List)
         .build();
 
+    ctrlc::set_handler(move || {
+        println!("Received Ctrl+C");
+    })
+    .expect("Error setting Ctrl-C handler");
+
     let mut rl = Editor::with_config(config)?;
 
     let helper = helper::ShellPromptHelper::default();