TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix autocompletion for paths with period (#5175)

Browse source 
* Bug fix

Updated bug fix

* Simplified conditionals

* Switched to use path separator constant
This commit is contained in:
Dylan Bulfin 2023-01-08 21:25:19 -05:00 • committed by GitHub
parent b368df5785
commit c4b0eb8356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
helix-term/src/ui/mod.rs
View file

@ -463,20 +463,30 @@ pub mod completers {
use ignore::WalkBuilder; use ignore::WalkBuilder;
use std::path::Path; 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 path = helix_core::path::expand_tilde(Path::new(input));
let (dir, file_name) = if input.ends_with(std::path::MAIN_SEPARATOR) { let (dir, file_name) = if input.ends_with(std::path::MAIN_SEPARATOR) {
(path, None) (path, None)
} else { } else {
let file_name = path let is_period = (input.ends_with((format!("{}.", std::path::MAIN_SEPARATOR)).as_str())
.file_name() && input.len() > 2)
.and_then(|file| file.to_str().map(|path| path.to_owned())); || 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() { let path = if is_period {
path
} else {
match path.parent() {
Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(), Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
// Path::new("h")'s parent is Some("")... // Path::new("h")'s parent is Some("")...
_ => std::env::current_dir().expect("couldn't determine current directory"), _ => std::env::current_dir().expect("couldn't determine current directory"),
}
}; };
(path, file_name) (path, file_name)