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

When renaming in project panel, select file names without extensions

Browse source
This commit is contained in:
Kirill Bulatov 2023-07-21 23:22:22 +03:00
parent e002d9efb0
commit 804da68af7
1 changed files with 61 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ mod project_panel_settings;
use context_menu::{ContextMenu, ContextMenuItem}; use context_menu::{ContextMenu, ContextMenuItem};
use db::kvp::KEY_VALUE_STORE; use db::kvp::KEY_VALUE_STORE;
use drag_and_drop::{DragAndDrop, Draggable}; use drag_and_drop::{DragAndDrop, Draggable};
use editor::{Cancel, Editor}; use editor::{scroll::autoscroll::Autoscroll, Cancel, Editor};
use file_associations::FileAssociations; use file_associations::FileAssociations;
use futures::stream::StreamExt; use futures::stream::StreamExt;
@ -730,13 +730,20 @@ impl ProjectPanel {
is_dir: entry.is_dir(), is_dir: entry.is_dir(),
processing_filename: None, processing_filename: None,
}); });
let filename = entry let file_name = entry
.path .path
.file_name() .file_name()
.map_or(String::new(), |s| s.to_string_lossy().to_string()); .map(|s| s.to_string_lossy())
.unwrap_or_default()
.to_string();
let file_stem = entry.path.file_stem().map(|s| s.to_string_lossy());
let selection_end =
file_stem.map_or(file_name.len(), |file_stem| file_stem.len());
self.filename_editor.update(cx, |editor, cx| { self.filename_editor.update(cx, |editor, cx| {
editor.set_text(filename, cx); editor.set_text(file_name, cx);
editor.select_all(&Default::default(), cx); editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.select_ranges([0..selection_end])
})
}); });
cx.focus(&self.filename_editor); cx.focus(&self.filename_editor);
self.update_visible_entries(None, cx); self.update_visible_entries(None, cx);
@ -1913,7 +1920,7 @@ mod tests {
.update(cx, |panel, cx| { .update(cx, |panel, cx| {
panel panel
.filename_editor .filename_editor
.update(cx, |editor, cx| editor.set_text("another-filename", cx)); .update(cx, |editor, cx| editor.set_text("another-filename.txt", cx));
panel.confirm(&Confirm, cx).unwrap() panel.confirm(&Confirm, cx).unwrap()
}) })
.await .await
@ -1927,14 +1934,14 @@ mod tests {
" v b", " v b",
" > 3", " > 3",
" > 4", " > 4",
" another-filename <== selected", " another-filename.txt <== selected",
" > C", " > C",
" .dockerignore", " .dockerignore",
" the-new-filename", " the-new-filename",
] ]
); );
select_path(&panel, "root1/b/another-filename", cx); select_path(&panel, "root1/b/another-filename.txt", cx);
panel.update(cx, |panel, cx| panel.rename(&Rename, cx)); panel.update(cx, |panel, cx| panel.rename(&Rename, cx));
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx), visible_entries_as_strings(&panel, 0..10, cx),
@ -1945,7 +1952,7 @@ mod tests {
" v b", " v b",
" > 3", " > 3",
" > 4", " > 4",
" [EDITOR: 'another-filename'] <== selected", " [EDITOR: 'another-filename.txt'] <== selected",
" > C", " > C",
" .dockerignore", " .dockerignore",
" the-new-filename", " the-new-filename",
@ -1953,9 +1960,15 @@ mod tests {
); );
let confirm = panel.update(cx, |panel, cx| { let confirm = panel.update(cx, |panel, cx| {
panel panel.filename_editor.update(cx, |editor, cx| {
.filename_editor let file_name_selections = editor.selections.all::<usize>(cx);
.update(cx, |editor, cx| editor.set_text("a-different-filename", cx)); assert_eq!(file_name_selections.len(), 1, "File editing should have a single selection, but got: {file_name_selections:?}");
let file_name_selection = &file_name_selections[0];
assert_eq!(file_name_selection.start, 0, "Should select the file name from the start");
assert_eq!(file_name_selection.end, "another-filename".len(), "Should not select file extension");
editor.set_text("a-different-filename.tar.gz", cx)
});
panel.confirm(&Confirm, cx).unwrap() panel.confirm(&Confirm, cx).unwrap()
}); });
assert_eq!( assert_eq!(
@ -1967,7 +1980,7 @@ mod tests {
" v b", " v b",
" > 3", " > 3",
" > 4", " > 4",
" [PROCESSING: 'a-different-filename'] <== selected", " [PROCESSING: 'a-different-filename.tar.gz'] <== selected",
" > C", " > C",
" .dockerignore", " .dockerignore",
" the-new-filename", " the-new-filename",
@ -1984,13 +1997,42 @@ mod tests {
" v b", " v b",
" > 3", " > 3",
" > 4", " > 4",
" a-different-filename <== selected", " a-different-filename.tar.gz <== selected",
" > C", " > C",
" .dockerignore", " .dockerignore",
" the-new-filename", " the-new-filename",
] ]
); );
panel.update(cx, |panel, cx| panel.rename(&Rename, cx));
assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx),
&[
"v root1",
" > .git",
" > a",
" v b",
" > 3",
" > 4",
" [EDITOR: 'a-different-filename.tar.gz'] <== selected",
" > C",
" .dockerignore",
" the-new-filename",
]
);
panel.update(cx, |panel, cx| {
panel.filename_editor.update(cx, |editor, cx| {
let file_name_selections = editor.selections.all::<usize>(cx);
assert_eq!(file_name_selections.len(), 1, "File editing should have a single selection, but got: {file_name_selections:?}");
let file_name_selection = &file_name_selections[0];
assert_eq!(file_name_selection.start, 0, "Should select the file name from the start");
assert_eq!(file_name_selection.end, "a-different-filename.tar".len(), "Should not select file extension, but still may select anything up to the last dot");
});
panel.cancel(&Cancel, cx)
});
panel.update(cx, |panel, cx| panel.new_directory(&NewDirectory, cx)); panel.update(cx, |panel, cx| panel.new_directory(&NewDirectory, cx));
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx), visible_entries_as_strings(&panel, 0..10, cx),
@ -2002,7 +2044,7 @@ mod tests {
" > [EDITOR: ''] <== selected", " > [EDITOR: ''] <== selected",
" > 3", " > 3",
" > 4", " > 4",
" a-different-filename", " a-different-filename.tar.gz",
" > C", " > C",
" .dockerignore", " .dockerignore",
] ]
@ -2025,7 +2067,7 @@ mod tests {
" > [PROCESSING: 'new-dir']", " > [PROCESSING: 'new-dir']",
" > 3 <== selected", " > 3 <== selected",
" > 4", " > 4",
" a-different-filename", " a-different-filename.tar.gz",
" > C", " > C",
" .dockerignore", " .dockerignore",
] ]
@ -2042,7 +2084,7 @@ mod tests {
" > 3 <== selected", " > 3 <== selected",
" > 4", " > 4",
" > new-dir", " > new-dir",
" a-different-filename", " a-different-filename.tar.gz",
" > C", " > C",
" .dockerignore", " .dockerignore",
] ]
@ -2059,7 +2101,7 @@ mod tests {
" > [EDITOR: '3'] <== selected", " > [EDITOR: '3'] <== selected",
" > 4", " > 4",
" > new-dir", " > new-dir",
" a-different-filename", " a-different-filename.tar.gz",
" > C", " > C",
" .dockerignore", " .dockerignore",
] ]
@ -2077,7 +2119,7 @@ mod tests {
" > 3 <== selected", " > 3 <== selected",
" > 4", " > 4",
" > new-dir", " > new-dir",
" a-different-filename", " a-different-filename.tar.gz",
" > C", " > C",
" .dockerignore", " .dockerignore",
] ]