andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Address review feedback

Browse Source
This commit is contained in:
Philipp Mildenberger 2024-10-20 00:59:15 +02:00
parent ce885df98e
commit 381732197e
No known key found for this signature in database
GPG Key ID: D2480C382214FD8E
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helix-term/src/handlers/completion.rs
View File

@ -369,13 +369,16 @@ pub fn trigger_auto_completion(
}) if triggers.iter().any(|trigger| text.ends_with(trigger)))
});
let trigger_path_completion = matches!(
text.get_bytes_at(text.len_bytes())
.and_then(|t| t.reversed().next()),
Some(b'/' | b'\\')
) && doc.path_completion_enabled();
let cursor_char = text
.get_bytes_at(text.len_bytes())
.and_then(|t| t.reversed().next());
if is_trigger_char || trigger_path_completion {
#[cfg(windows)]
let is_path_completion_trigger = matches!(cursor_char, Some(b'/' | b'\\'));
#[cfg(not(windows))]
let is_path_completion_trigger = matches!(cursor_char, Some(b'/'));
if is_trigger_char || (is_path_completion_trigger && doc.path_completion_enabled()) {
send_blocking(
tx,
CompletionEvent::TriggerChar {

14
helix-term/src/handlers/completion/path.rs
View File

@ -49,7 +49,11 @@ pub(crate) fn path_completion(
Some(parent_dir) if path.is_relative() => parent_dir.join(&path),
_ => path.into_owned(),
};
#[cfg(windows)]
let ends_with_slash = matches!(matched_path.as_bytes().last(), Some(b'/' | b'\\'));
#[cfg(not(windows))]
let ends_with_slash = matches!(matched_path.as_bytes().last(), Some(b'/'));
if ends_with_slash {
Some((PathBuf::from(path.as_path()), None))
} else {
@ -81,17 +85,15 @@ pub(crate) fn path_completion(
dir_entry
.metadata()
.ok()
.map(|md| (dir_entry.file_name(), md))
.and_then(|md| Some((dir_entry.file_name().into_string().ok()?, md)))
})
.map_while(|(file_name, md)| {
if cancel.load(Ordering::Relaxed) {
return None;
}
let file_name_str = file_name.to_string_lossy().to_string();
let kind = path_kind(&md);
let documentation = path_documentation(&md, &dir_path.join(file_name), kind);
let documentation = path_documentation(&md, &dir_path.join(&file_name), kind);
let edit_diff = typed_file_name
.as_ref()
@ -100,12 +102,12 @@ pub(crate) fn path_completion(
let transaction = Transaction::change(
&text,
std::iter::once((cursor - edit_diff, cursor, Some((&file_name_str).into()))),
std::iter::once((cursor - edit_diff, cursor, Some((&file_name).into()))),
);
Some(CompletionItem::Other(core::CompletionItem {
kind: Cow::Borrowed(kind),
label: file_name_str.into(),
label: file_name.into(),
transaction,
documentation,
}))