From c4b0eb835639d2c18d940cd0c55093a92169b432 Mon Sep 17 00:00:00 2001
From: Dylan Bulfin <31492860+DylanBulfin@users.noreply.github.com>
Date: Sun, 8 Jan 2023 21:25:19 -0500
Subject: [PATCH] Fix autocompletion for paths with period (#5175)
* Bug fix
Updated bug fix
* Simplified conditionals
* Switched to use path separator constant
---
helix-term/src/ui/mod.rs | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index ade1d8cf..eb480758 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -463,20 +463,30 @@ pub mod completers {
use ignore::WalkBuilder;
use std::path::Path;
- let is_tilde = input.starts_with('~') && input.len() == 1;
+ let is_tilde = input == "~";
let path = helix_core::path::expand_tilde(Path::new(input));
let (dir, file_name) = if input.ends_with(std::path::MAIN_SEPARATOR) {
(path, None)
} else {
- let file_name = path
- .file_name()
- .and_then(|file| file.to_str().map(|path| path.to_owned()));
+ let is_period = (input.ends_with((format!("{}.", std::path::MAIN_SEPARATOR)).as_str())
+ && input.len() > 2)
+ || input == ".";
+ let file_name = if is_period {
+ Some(String::from("."))
+ } else {
+ path.file_name()
+ .and_then(|file| file.to_str().map(|path| path.to_owned()))
+ };
- let path = match path.parent() {
- Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
- // Path::new("h")'s parent is Some("")...
- _ => std::env::current_dir().expect("couldn't determine current directory"),
+ let path = if is_period {
+ path
+ } else {
+ match path.parent() {
+ Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
+ // Path::new("h")'s parent is Some("")...
+ _ => std::env::current_dir().expect("couldn't determine current directory"),
+ }
};
(path, file_name)