Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix edge case with absolute file paths

Browse source
This commit is contained in:
Mikayla Maki 2023-06-29 17:48:01 -07:00
parent 33f5248d4f
commit cd670e340f
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/project_panel/src/project_panel.rs
View file

@ -547,7 +547,7 @@ impl ProjectPanel {
worktree_id, worktree_id,
entry_id: NEW_ENTRY_ID, entry_id: NEW_ENTRY_ID,
}); });
let new_path = entry.path.join(&filename); let new_path = entry.path.join(&filename.trim_start_matches("/"));
if path_already_exists(new_path.as_path()) { if path_already_exists(new_path.as_path()) {
return None; return None;
} }
@ -2111,7 +2111,7 @@ mod tests {
let confirm = panel.update(cx, |panel, cx| { let confirm = panel.update(cx, |panel, cx| {
panel.filename_editor.update(cx, |editor, cx| { panel.filename_editor.update(cx, |editor, cx| {
editor.set_text("bdir1/dir2/the-new-filename", cx) editor.set_text("/bdir1/dir2/the-new-filename", cx)
}); });
panel.confirm(&Confirm, cx).unwrap() panel.confirm(&Confirm, cx).unwrap()
}); });
@ -2124,7 +2124,7 @@ mod tests {
" > a", " > a",
" > b", " > b",
" > C", " > C",
" [PROCESSING: 'bdir1/dir2/the-new-filename'] <== selected", " [PROCESSING: '/bdir1/dir2/the-new-filename'] <== selected",
" .dockerignore", " .dockerignore",
"v root2", "v root2",
" > d", " > d",