file_finder: Display duplicated file in file finder history (#41917)
Closes #41850 When digging into this I figured out that basically what was going on is in the history of the file finder it doesn't update the name of the file duplicated because when you duplicate a file it's named automatically with `filename copy` and so this filename was added to the history but not updated so once you wanted to go back into this file it was not part of file finder displayed history anymore because this file doesn't exist anymore but the entity id remains the same. I was also to reproduce this bug when just renaming a file. Release Notes: - Fixed: Display duplicated file in file finder history --------- Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com> Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
This commit is contained in:
Coenen Benjamin
co-authored by
Conrad Irwin
Lukas Wirth
Conrad Irwin
Lukas Wirth
parent
58cec41932
commit
2b6cf31ace
@@ -2199,6 +2199,396 @@ async fn test_create_duplicate_items(cx: &mut gpui::TestAppContext) {
|
||||
);
|
||||
}
|
||||
|
||||
// NOTE: This test is skipped on Windows, because on Windows,
|
||||
// when it triggers the lsp store it converts `/src/test/first copy.txt` into an uri
|
||||
// but it fails with message `"/src\\test\\first copy.txt" is not parseable as an URI`
|
||||
#[gpui::test]
|
||||
#[cfg_attr(target_os = "windows", ignore)]
|
||||
async fn test_create_duplicate_items_and_check_history(cx: &mut gpui::TestAppContext) {
|
||||
init_test_with_editor(cx);
|
||||
|
||||
let fs = FakeFs::new(cx.executor());
|
||||
fs.insert_tree(
|
||||
"/src",
|
||||
json!({
|
||||
"test": {
|
||||
"first.txt": "// First Txt file",
|
||||
"second.txt": "// Second Txt file",
|
||||
"third.txt": "// Third Txt file",
|
||||
}
|
||||
}),
|
||||
)
|
||||
.await;
|
||||
|
||||
let project = Project::test(fs.clone(), ["/src".as_ref()], cx).await;
|
||||
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
|
||||
let cx = &mut VisualTestContext::from_window(*workspace, cx);
|
||||
let panel = workspace
|
||||
.update(cx, |workspace, window, cx| {
|
||||
let panel = ProjectPanel::new(workspace, window, cx);
|
||||
workspace.add_panel(panel.clone(), window, cx);
|
||||
panel
|
||||
})
|
||||
.unwrap();
|
||||
cx.run_until_parked();
|
||||
|
||||
select_path(&panel, "src", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
//
|
||||
"v src <== selected",
|
||||
" > test"
|
||||
]
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel.new_directory(&NewDirectory, window, cx)
|
||||
});
|
||||
cx.run_until_parked();
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(panel.filename_editor.read(cx).is_focused(window));
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
//
|
||||
"v src",
|
||||
" > [EDITOR: ''] <== selected",
|
||||
" > test"
|
||||
]
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel
|
||||
.filename_editor
|
||||
.update(cx, |editor, cx| editor.set_text("test", window, cx));
|
||||
assert!(
|
||||
panel.confirm_edit(true, window, cx).is_none(),
|
||||
"Should not allow to confirm on conflicting new directory name"
|
||||
);
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(
|
||||
panel.state.edit_state.is_some(),
|
||||
"Edit state should not be None after conflicting new directory name"
|
||||
);
|
||||
panel.cancel(&menu::Cancel, window, cx);
|
||||
panel.update_visible_entries(None, false, false, window, cx);
|
||||
});
|
||||
cx.run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
//
|
||||
"v src <== selected",
|
||||
" > test"
|
||||
],
|
||||
"File list should be unchanged after failed folder create confirmation"
|
||||
);
|
||||
|
||||
select_path(&panel, "src/test", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
//
|
||||
"v src",
|
||||
" > test <== selected"
|
||||
]
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
|
||||
cx.run_until_parked();
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(panel.filename_editor.read(cx).is_focused(window));
|
||||
});
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" [EDITOR: ''] <== selected",
|
||||
" first.txt",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
]
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel
|
||||
.filename_editor
|
||||
.update(cx, |editor, cx| editor.set_text("first.txt", window, cx));
|
||||
assert!(
|
||||
panel.confirm_edit(true, window, cx).is_none(),
|
||||
"Should not allow to confirm on conflicting new file name"
|
||||
);
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(
|
||||
panel.state.edit_state.is_some(),
|
||||
"Edit state should not be None after conflicting new file name"
|
||||
);
|
||||
panel.cancel(&menu::Cancel, window, cx);
|
||||
panel.update_visible_entries(None, false, false, window, cx);
|
||||
});
|
||||
cx.run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test <== selected",
|
||||
" first.txt",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
"File list should be unchanged after failed file create confirmation"
|
||||
);
|
||||
|
||||
select_path(&panel, "src/test/first.txt", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" first.txt <== selected",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(panel.filename_editor.read(cx).is_focused(window));
|
||||
});
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" [EDITOR: 'first.txt'] <== selected",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
]
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel
|
||||
.filename_editor
|
||||
.update(cx, |editor, cx| editor.set_text("second.txt", window, cx));
|
||||
assert!(
|
||||
panel.confirm_edit(true, window, cx).is_none(),
|
||||
"Should not allow to confirm on conflicting file rename"
|
||||
)
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(
|
||||
panel.state.edit_state.is_some(),
|
||||
"Edit state should not be None after conflicting file rename"
|
||||
);
|
||||
panel.cancel(&menu::Cancel, window, cx);
|
||||
});
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" first.txt <== selected",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
"File list should be unchanged after failed rename confirmation"
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
// Try to duplicate and check history
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel.duplicate(&Duplicate, window, cx)
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" first.txt",
|
||||
" [EDITOR: 'first copy.txt'] <== selected <== marked",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
);
|
||||
|
||||
let confirm = panel.update_in(cx, |panel, window, cx| {
|
||||
panel
|
||||
.filename_editor
|
||||
.update(cx, |editor, cx| editor.set_text("fourth.txt", window, cx));
|
||||
panel.confirm_edit(true, window, cx).unwrap()
|
||||
});
|
||||
confirm.await.unwrap();
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" first.txt",
|
||||
" fourth.txt <== selected",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
"File list should be different after rename confirmation"
|
||||
);
|
||||
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel.update_visible_entries(None, false, false, window, cx);
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
select_path(&panel, "src/test/first.txt", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
workspace
|
||||
.read_with(cx, |this, cx| {
|
||||
assert!(
|
||||
this.recent_navigation_history_iter(cx)
|
||||
.any(|(project_path, abs_path)| {
|
||||
project_path.path == Arc::from(rel_path("test/fourth.txt"))
|
||||
&& abs_path == Some(PathBuf::from(path!("/src/test/fourth.txt")))
|
||||
})
|
||||
);
|
||||
})
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
// NOTE: This test is skipped on Windows, because on Windows,
|
||||
// when it triggers the lsp store it converts `/src/test/first.txt` into an uri
|
||||
// but it fails with message `"/src\\test\\first.txt" is not parseable as an URI`
|
||||
#[gpui::test]
|
||||
#[cfg_attr(target_os = "windows", ignore)]
|
||||
async fn test_rename_item_and_check_history(cx: &mut gpui::TestAppContext) {
|
||||
init_test_with_editor(cx);
|
||||
|
||||
let fs = FakeFs::new(cx.executor());
|
||||
fs.insert_tree(
|
||||
"/src",
|
||||
json!({
|
||||
"test": {
|
||||
"first.txt": "// First Txt file",
|
||||
"second.txt": "// Second Txt file",
|
||||
"third.txt": "// Third Txt file",
|
||||
}
|
||||
}),
|
||||
)
|
||||
.await;
|
||||
|
||||
let project = Project::test(fs.clone(), ["/src".as_ref()], cx).await;
|
||||
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
|
||||
let cx = &mut VisualTestContext::from_window(*workspace, cx);
|
||||
let panel = workspace
|
||||
.update(cx, |workspace, window, cx| {
|
||||
let panel = ProjectPanel::new(workspace, window, cx);
|
||||
workspace.add_panel(panel.clone(), window, cx);
|
||||
panel
|
||||
})
|
||||
.unwrap();
|
||||
cx.run_until_parked();
|
||||
|
||||
select_path(&panel, "src", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
//
|
||||
"v src <== selected",
|
||||
" > test"
|
||||
]
|
||||
);
|
||||
|
||||
select_path(&panel, "src/test", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
//
|
||||
"v src",
|
||||
" > test <== selected"
|
||||
]
|
||||
);
|
||||
panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
|
||||
cx.run_until_parked();
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
assert!(panel.filename_editor.read(cx).is_focused(window));
|
||||
});
|
||||
|
||||
select_path(&panel, "src/test/first.txt", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" [EDITOR: 'first.txt'] <== selected <== marked",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
);
|
||||
|
||||
let confirm = panel.update_in(cx, |panel, window, cx| {
|
||||
panel
|
||||
.filename_editor
|
||||
.update(cx, |editor, cx| editor.set_text("fourth.txt", window, cx));
|
||||
panel.confirm_edit(true, window, cx).unwrap()
|
||||
});
|
||||
confirm.await.unwrap();
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
assert_eq!(
|
||||
visible_entries_as_strings(&panel, 0..10, cx),
|
||||
&[
|
||||
"v src",
|
||||
" v test",
|
||||
" fourth.txt <== selected",
|
||||
" second.txt",
|
||||
" third.txt"
|
||||
],
|
||||
"File list should be different after rename confirmation"
|
||||
);
|
||||
|
||||
panel.update_in(cx, |panel, window, cx| {
|
||||
panel.update_visible_entries(None, false, false, window, cx);
|
||||
});
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
select_path(&panel, "src/test/second.txt", cx);
|
||||
panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
|
||||
cx.executor().run_until_parked();
|
||||
|
||||
workspace
|
||||
.read_with(cx, |this, cx| {
|
||||
assert!(
|
||||
this.recent_navigation_history_iter(cx)
|
||||
.any(|(project_path, abs_path)| {
|
||||
project_path.path == Arc::from(rel_path("test/fourth.txt"))
|
||||
&& abs_path == Some(PathBuf::from(path!("/src/test/fourth.txt")))
|
||||
})
|
||||
);
|
||||
})
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_select_git_entry(cx: &mut gpui::TestAppContext) {
|
||||
init_test_with_editor(cx);
|
||||
|
||||
Reference in New Issue
Block a user