kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: use display method on paths

Browse source
This commit is contained in:
Nikita Revenco 2025-02-18 10:48:38 +00:00
parent 835cda11f1
commit b3d0f16276
2 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -378,22 +378,22 @@ pub fn file_explorer(root: PathBuf, editor: &Editor) -> Result<FileExplorer, std
// execute an action based on that. Maybe re-use the existing Prompt component somehow?
|cx, (path, _is_dir): &(PathBuf, bool)|,
// create
alt!('c') => {
alt!('n') => {
create_file_operation_prompt("create:", cx, path, |_, to_create_str| {
let to_create = helix_stdx::path::expand_tilde(PathBuf::from(to_create_str));
if to_create.exists() {
return Err(format!("Path {to_create_str} already exists"))
return Err(format!("Path {} already exists", to_create.display()))
};
if to_create_str.ends_with(std::path::MAIN_SEPARATOR) {
fs::create_dir_all(to_create).map_err(|err| format!("Unable to create directory {to_create_str}: {err}"))?;
fs::create_dir_all(&to_create).map_err(|err| format!("Unable to create directory {}: {err}", to_create.display()))?;
Ok(format!("Created directory: {to_create_str}"))
Ok(format!("Created directory: {}", to_create.display()))
} else {
fs::File::create(to_create).map_err(|err| format!("Unable to create file {to_create_str}: {err}"))?;
fs::File::create(&to_create).map_err(|err| format!("Unable to create file {}: {err}", to_create.display()))?;
Ok(format!("Created file: {to_create_str}"))
Ok(format!("Created file: {}", to_create.display()))
}
})
},
@ -407,14 +407,14 @@ pub fn file_explorer(root: PathBuf, editor: &Editor) -> Result<FileExplorer, std
},
// delete
alt!('d') => {
create_file_operation_prompt("delete? (y/n):", cx, path, |_, input| {
let to_delete = helix_stdx::path::expand_tilde(PathBuf::from(input));
if matches!(input, "y" | "n") {
if to_delete.exists() {
create_file_operation_prompt("delete? (y/n):", cx, path, |_, to_delete_str| {
let to_delete = helix_stdx::path::expand_tilde(PathBuf::from(to_delete_str));
if to_delete_str == "y" {
if !to_delete.exists() {
return Err(format!("Path {} does not exist", to_delete.display()))
};
if input.ends_with(std::path::MAIN_SEPARATOR) {
if to_delete_str.ends_with(std::path::MAIN_SEPARATOR) {
fs::remove_dir_all(&to_delete).map_err(|err| format!("Unable to delete directory {}: {err}", to_delete.display()))?;
Ok(format!("Deleted directory: {}", to_delete.display()))
@ -424,29 +424,37 @@ pub fn file_explorer(root: PathBuf, editor: &Editor) -> Result<FileExplorer, std
Ok(format!("Deleted file: {}", to_delete.display()))
}
} else {
Ok(format!("Did not delete: {}", to_delete.display()))
Ok("".into())
}
})
},
// copy
alt!('y') => {
// copy contents
alt!('c') => {
create_file_operation_prompt("copy-to:", cx, path, |copy_from, copy_to_str| {
let copy_to = helix_stdx::path::expand_tilde(PathBuf::from(copy_to_str));
if copy_to_str.ends_with('/') {
if copy_from.is_dir() || copy_to_str.ends_with('/') {
// TODO: support copying directories (recursively)?. This isn't built-in to the standard library
Err(format!("Copying directories is not supported: {} is a directory", copy_from.display()))
} else if copy_to.exists() {
// TODO: confirmation prompt when overwriting
Err(format!("Path {copy_to_str} exists"))
Err(format!("Path {} exists", copy_to.display()))
} else {
std::fs::copy(copy_from, copy_to).map_err(
|err| format!("Unable to copy from file {} to {copy_to_str}: {err}",
copy_from.display()
std::fs::copy(copy_from, &copy_to).map_err(
|err| format!("Unable to copy from file {} to {}: {err}",
copy_from.display(), copy_to.display()
))?;
Ok(format!("Copied contents of file {} to {copy_to_str}", copy_from.display()))
Ok(format!("Copied contents of file {} to {}", copy_from.display(), copy_to.display()))
}
})
},
// copy path
alt!('y') => {
// TODO
// cx.
// cx.editor.registers
// .unwrap_or(cx.editor.config().default_yank_register)
}
});
Ok(picker)

13
helix-term/src/ui/picker.rs
View file

@ -1065,6 +1065,10 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
EventResult::Consumed(Some(callback))
};
if let EventResult::Consumed(_) = self.custom_event_handler(&key_event, ctx) {
return EventResult::Consumed(None);
}
match key_event {
shift!(Tab) | key!(Up) | ctrl!('p') => {
self.move_by(1, Direction::Backward);
@ -1132,13 +1136,8 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
ctrl!('t') => {
self.toggle_preview();
}
key_event => {
if !matches!(
self.custom_event_handler(&key_event, ctx),
EventResult::Consumed(_)
) {
self.prompt_handle_event(event, ctx);
};
_ => {
self.prompt_handle_event(event, ctx);
}
}