zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-06 03:45:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

project_panel: Select the newly created file when copy/pasting a file (#14705)

Browse Source 
Closes: #14361 

Release Notes:

- Improved project panel to select newly created file on copy/paste ([#14361](https://github.com/zed-industries/zed/issues/14361))
This commit is contained in:
CharlesChen0823 2024-07-18 22:26:33 +08:00 committed by GitHub
parent ed3d3dc690
commit bac4a0428d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -8107,6 +8107,7 @@ dependencies = [
"db",
"editor",
"file_icons",
"futures 0.3.28",
"git",
"gpui",
"language",

1
crates/project_panel/Cargo.toml
View File

@ -18,6 +18,7 @@ collections.workspace = true
db.workspace = true
editor.workspace = true
file_icons.workspace = true
futures.workspace = true
git.workspace = true
gpui.workspace = true
menu.workspace = true

50
crates/project_panel/src/project_panel.rs
View File

@ -1307,6 +1307,8 @@ impl ProjectPanel {
.as_ref()
.filter(|clipboard| !clipboard.items().is_empty())?;
let mut tasks = Vec::new();
for clipboard_entry in clipboard_entries.items() {
if clipboard_entry.worktree_id != worktree_id {
return None;
@ -1318,15 +1320,34 @@ impl ProjectPanel {
.update(cx, |project, cx| {
project.rename_entry(clipboard_entry.entry_id, new_path, cx)
})
.detach_and_log_err(cx)
.detach_and_log_err(cx);
} else {
self.project
.update(cx, |project, cx| {
project.copy_entry(clipboard_entry.entry_id, new_path, cx)
})
.detach_and_log_err(cx)
let task = self.project.update(cx, |project, cx| {
project.copy_entry(clipboard_entry.entry_id, new_path, cx)
});
tasks.push(task);
}
}
cx.spawn(|project_panel, mut cx| async move {
let entry_ids = futures::future::join_all(tasks).await;
if let Some(Some(entry)) = entry_ids
.into_iter()
.rev()
.find_map(|entry_id| entry_id.ok())
{
project_panel
.update(&mut cx, |project_panel, _cx| {
project_panel.selection = Some(SelectedEntry {
worktree_id,
entry_id: entry.id,
});
})
.ok();
}
})
.detach();
self.expand_entry(worktree_id, entry.id, cx);
Some(())
});
@ -3579,8 +3600,8 @@ mod tests {
&[
//
"v root1",
" one.two copy.txt",
" one.two.txt <== selected",
" one.two copy.txt <== selected",
" one.two.txt",
" one.txt",
]
);
@ -3595,9 +3616,9 @@ mod tests {
&[
//
"v root1",
" one.two copy 1.txt",
" one.two copy 1.txt <== selected",
" one.two copy.txt",
" one.two.txt <== selected",
" one.two.txt",
" one.txt",
]
);
@ -3682,10 +3703,13 @@ mod tests {
visible_entries_as_strings(&panel, 0..50, cx),
&[
//
"v root <== selected",
"v root",
" > a",
" > a copy",
" > a copy 1",
" v a copy",
" > a <== selected",
" > inner_dir",
" one.txt",
" two.txt",
" v b",
" v a",
" v inner_dir",