Unify action names with keybinding name

This commit is contained in:
Joseph Lyons 2023-03-12 04:37:39 -04:00
parent e8b3d4e0fa
commit 06ad3a7f7b

View file

@ -115,8 +115,8 @@ actions!(
[ [
ExpandSelectedEntry, ExpandSelectedEntry,
CollapseSelectedEntry, CollapseSelectedEntry,
AddDirectory, NewDirectory,
AddFile, NewFile,
Copy, Copy,
CopyPath, CopyPath,
RevealInFinder, RevealInFinder,
@ -305,8 +305,8 @@ impl ProjectPanel {
)); ));
} }
} }
menu_entries.push(ContextMenuItem::item("New File", AddFile)); menu_entries.push(ContextMenuItem::item("New File", NewFile));
menu_entries.push(ContextMenuItem::item("New Folder", AddDirectory)); menu_entries.push(ContextMenuItem::item("New Folder", NewDirectory));
menu_entries.push(ContextMenuItem::item("Reveal in Finder", RevealInFinder)); menu_entries.push(ContextMenuItem::item("Reveal in Finder", RevealInFinder));
menu_entries.push(ContextMenuItem::Separator); menu_entries.push(ContextMenuItem::Separator);
menu_entries.push(ContextMenuItem::item("Copy", Copy)); menu_entries.push(ContextMenuItem::item("Copy", Copy));
@ -531,11 +531,11 @@ impl ProjectPanel {
}); });
} }
fn add_file(&mut self, _: &AddFile, cx: &mut ViewContext<Self>) { fn add_file(&mut self, _: &NewFile, cx: &mut ViewContext<Self>) {
self.add_entry(false, cx) self.add_entry(false, cx)
} }
fn add_directory(&mut self, _: &AddDirectory, cx: &mut ViewContext<Self>) { fn add_directory(&mut self, _: &NewDirectory, cx: &mut ViewContext<Self>) {
self.add_entry(true, cx) self.add_entry(true, cx)
} }
@ -1552,7 +1552,7 @@ mod tests {
// Add a file with the root folder selected. The filename editor is placed // Add a file with the root folder selected. The filename editor is placed
// before the first file in the root folder. // before the first file in the root folder.
panel.update(cx, |panel, cx| panel.add_file(&AddFile, cx)); panel.update(cx, |panel, cx| panel.add_file(&NewFile, cx));
assert!(panel.read_with(cx, |panel, cx| panel.filename_editor.is_focused(cx))); assert!(panel.read_with(cx, |panel, cx| panel.filename_editor.is_focused(cx)));
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx), visible_entries_as_strings(&panel, 0..10, cx),
@ -1610,7 +1610,7 @@ mod tests {
); );
select_path(&panel, "root1/b", cx); select_path(&panel, "root1/b", cx);
panel.update(cx, |panel, cx| panel.add_file(&AddFile, cx)); panel.update(cx, |panel, cx| panel.add_file(&NewFile, cx));
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx), visible_entries_as_strings(&panel, 0..10, cx),
&[ &[
@ -1709,7 +1709,7 @@ mod tests {
] ]
); );
panel.update(cx, |panel, cx| panel.add_directory(&AddDirectory, cx)); panel.update(cx, |panel, cx| panel.add_directory(&NewDirectory, cx));
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx), visible_entries_as_strings(&panel, 0..10, cx),
&[ &[