mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-27 16:57:08 +00:00
Merge pull request #2322 from zed-industries/project-panel-paste-infinite-loop
Fix infinite loop in ProjectPanel::paste when filename has multiple dots
This commit is contained in:
commit
c68c8462bb
1 changed files with 78 additions and 2 deletions
|
@ -759,10 +759,12 @@ impl ProjectPanel {
|
||||||
if ix > 0 {
|
if ix > 0 {
|
||||||
new_file_name.push(format!(" {}", ix));
|
new_file_name.push(format!(" {}", ix));
|
||||||
}
|
}
|
||||||
new_path.push(new_file_name);
|
|
||||||
if let Some(extension) = extension.as_ref() {
|
if let Some(extension) = extension.as_ref() {
|
||||||
new_path.set_extension(&extension);
|
new_file_name.push(".");
|
||||||
|
new_file_name.push(extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
new_path.push(new_file_name);
|
||||||
ix += 1;
|
ix += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1802,6 +1804,80 @@ mod tests {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[gpui::test]
|
||||||
|
async fn test_copy_paste(cx: &mut gpui::TestAppContext) {
|
||||||
|
cx.foreground().forbid_parking();
|
||||||
|
cx.update(|cx| {
|
||||||
|
let settings = Settings::test(cx);
|
||||||
|
cx.set_global(settings);
|
||||||
|
});
|
||||||
|
|
||||||
|
let fs = FakeFs::new(cx.background());
|
||||||
|
fs.insert_tree(
|
||||||
|
"/root1",
|
||||||
|
json!({
|
||||||
|
"one.two.txt": "",
|
||||||
|
"one.txt": ""
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
|
||||||
|
let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
|
||||||
|
let panel = workspace.update(cx, |_, cx| ProjectPanel::new(project, cx));
|
||||||
|
|
||||||
|
panel.update(cx, |panel, cx| {
|
||||||
|
panel.select_next(&Default::default(), cx);
|
||||||
|
panel.select_next(&Default::default(), cx);
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
visible_entries_as_strings(&panel, 0..50, cx),
|
||||||
|
&[
|
||||||
|
//
|
||||||
|
"v root1",
|
||||||
|
" one.two.txt <== selected",
|
||||||
|
" one.txt",
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Regression test - file name is created correctly when
|
||||||
|
// the copied file's name contains multiple dots.
|
||||||
|
panel.update(cx, |panel, cx| {
|
||||||
|
panel.copy(&Default::default(), cx);
|
||||||
|
panel.paste(&Default::default(), cx);
|
||||||
|
});
|
||||||
|
cx.foreground().run_until_parked();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
visible_entries_as_strings(&panel, 0..50, cx),
|
||||||
|
&[
|
||||||
|
//
|
||||||
|
"v root1",
|
||||||
|
" one.two copy.txt",
|
||||||
|
" one.two.txt <== selected",
|
||||||
|
" one.txt",
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
panel.update(cx, |panel, cx| {
|
||||||
|
panel.paste(&Default::default(), cx);
|
||||||
|
});
|
||||||
|
cx.foreground().run_until_parked();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
visible_entries_as_strings(&panel, 0..50, cx),
|
||||||
|
&[
|
||||||
|
//
|
||||||
|
"v root1",
|
||||||
|
" one.two copy 1.txt",
|
||||||
|
" one.two copy.txt",
|
||||||
|
" one.two.txt <== selected",
|
||||||
|
" one.txt",
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
fn toggle_expand_dir(
|
fn toggle_expand_dir(
|
||||||
panel: &ViewHandle<ProjectPanel>,
|
panel: &ViewHandle<ProjectPanel>,
|
||||||
path: impl AsRef<Path>,
|
path: impl AsRef<Path>,
|
||||||
|
|
Loading…
Reference in a new issue