suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: remove previous pickers when refreshing the current one

pull/12902/head
Nikita Revenco 2025-02-18 15:17:01 +00:00
parent ed570d9f45
commit eb35b604b5
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
helix-term/src/ui/mod.rs
View File

@ -33,9 +33,9 @@ pub use text::Text;
use helix_view::Editor; use helix_view::Editor;
use tui::text::Span; use tui::text::Span;
use std::fs;
use std::path::Path; use std::path::Path;
use std::{error::Error, path::PathBuf}; use std::{error::Error, path::PathBuf};
use std::{fs, path};
use self::picker::PickerKeyHandler; use self::picker::PickerKeyHandler;
@ -382,9 +382,17 @@ fn create_file_operation_prompt(
cx.jobs.callback(callback); cx.jobs.callback(callback);
} }
fn refresh_file_explorer(cursor: Option<u32>, cx: &mut Context, root: PathBuf) { fn refresh_file_explorer(
remove_previous: bool,
cursor: Option<u32>,
cx: &mut Context,
root: PathBuf,
) {
let callback = Box::pin(async move { let callback = Box::pin(async move {
let call: Callback = Callback::EditorCompositor(Box::new(move |editor, compositor| { let call: Callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
if remove_previous {
compositor.pop();
}
if let Ok(picker) = file_explorer(cursor, root, editor) { if let Ok(picker) = file_explorer(cursor, root, editor) {
compositor.push(Box::new(overlay::overlaid(picker))); compositor.push(Box::new(overlay::overlaid(picker)));
} }
@ -454,7 +462,7 @@ pub fn file_explorer(
}) { }) {
return Some(Err(err)); return Some(Err(err));
} }
refresh_file_explorer(Some(cursor), cx, root); refresh_file_explorer(true, Some(cursor), cx, root);
Some(Ok(format!("Created directory: {}", to_create.display()))) Some(Ok(format!("Created directory: {}", to_create.display())))
} else { } else {
@ -463,7 +471,7 @@ pub fn file_explorer(
}) { }) {
return Some(Err(err)); return Some(Err(err));
}; };
refresh_file_explorer(Some(cursor), cx, root); refresh_file_explorer(true, Some(cursor), cx, root);
Some(Ok(format!("Created file: {}", to_create.display()))) Some(Ok(format!("Created file: {}", to_create.display())))
} }
@ -525,7 +533,7 @@ pub fn file_explorer(
}) { }) {
return Some(Err(err)); return Some(Err(err));
}; };
refresh_file_explorer(Some(cursor), cx, root); refresh_file_explorer(true, Some(cursor), cx, root);
None None
}; };
@ -579,7 +587,7 @@ pub fn file_explorer(
}) { }) {
return Some(Err(err)); return Some(Err(err));
}; };
refresh_file_explorer(Some(cursor), cx, root); refresh_file_explorer(true, Some(cursor), cx, root);
Some(Ok(format!("Deleted directory: {}", to_delete.display()))) Some(Ok(format!("Deleted directory: {}", to_delete.display())))
} else { } else {
@ -588,7 +596,7 @@ pub fn file_explorer(
}) { }) {
return Some(Err(err)); return Some(Err(err));
}; };
refresh_file_explorer(Some(cursor), cx, root); refresh_file_explorer(true, Some(cursor), cx, root);
Some(Ok(format!("Deleted file: {}", to_delete.display()))) Some(Ok(format!("Deleted file: {}", to_delete.display())))
} }
@ -628,7 +636,7 @@ pub fn file_explorer(
}) { }) {
return Some(Err(err)); return Some(Err(err));
}; };
refresh_file_explorer(Some(cursor), cx, root); refresh_file_explorer(true, Some(cursor), cx, root);
Some(Ok(format!( Some(Ok(format!(
"Copied contents of file {} to {}", "Copied contents of file {} to {}",
@ -679,7 +687,7 @@ pub fn file_explorer(
move |cx, (path, is_dir): &(PathBuf, bool), action| { move |cx, (path, is_dir): &(PathBuf, bool), action| {
if *is_dir { if *is_dir {
let new_root = helix_stdx::path::normalize(path); let new_root = helix_stdx::path::normalize(path);
refresh_file_explorer(None, cx, new_root); refresh_file_explorer(false, None, cx, new_root);
} else if let Err(e) = cx.editor.open(path, action) { } else if let Err(e) = cx.editor.open(path, action) {
let err = if let Some(err) = e.source() { let err = if let Some(err) = e.source() {
format!("{}", err) format!("{}", err)