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

Fix bug preventing spaces from being used in filename

Browse source
This commit is contained in:
Joseph T. Lyons 2023-11-29 22:04:41 -05:00
parent b4a5701e12
commit 1a1451a943
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
assets/keymaps/default.json
View file

@ -530,12 +530,17 @@
"alt-cmd-shift-c": "project_panel::CopyRelativePath", "alt-cmd-shift-c": "project_panel::CopyRelativePath",
"f2": "project_panel::Rename", "f2": "project_panel::Rename",
"enter": "project_panel::Rename", "enter": "project_panel::Rename",
"space": "project_panel::Open",
"backspace": "project_panel::Delete", "backspace": "project_panel::Delete",
"alt-cmd-r": "project_panel::RevealInFinder", "alt-cmd-r": "project_panel::RevealInFinder",
"alt-shift-f": "project_panel::NewSearchInDirectory" "alt-shift-f": "project_panel::NewSearchInDirectory"
} }
}, },
{
"context": "ProjectPanel && not_editing",
"bindings": {
"space": "project_panel::Open"
}
},
{ {
"context": "CollabPanel && not_editing", "context": "CollabPanel && not_editing",
"bindings": { "bindings": {

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

@ -1627,9 +1627,21 @@ impl View for ProjectPanel {
} }
} }
fn update_keymap_context(&self, keymap: &mut KeymapContext, _: &AppContext) { fn update_keymap_context(&self, keymap: &mut KeymapContext, cx: &AppContext) {
Self::reset_to_default_keymap_context(keymap); Self::reset_to_default_keymap_context(keymap);
keymap.add_identifier("menu"); keymap.add_identifier("menu");
if let Some(window) = cx.active_window() {
window.read_with(cx, |cx| {
let identifier = if self.filename_editor.is_focused(cx) {
"editing"
} else {
"not_editing"
};
keymap.add_identifier(identifier);
});
}
} }
fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) { fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {

18
crates/project_panel2/src/project_panel.rs
View file

@ -3011,3 +3011,21 @@ mod tests {
.unwrap(); .unwrap();
} }
} }
// TODO - implement this in the new keymap system
// fn update_keymap_context(&self, keymap: &mut KeymapContext, cx: &AppContext) {
// Self::reset_to_default_keymap_context(keymap);
// keymap.add_identifier("menu");
// if let Some(window) = cx.active_window() {
// window.read_with(cx, |cx| {
// let identifier = if self.filename_editor.is_focused(cx) {
// "editing"
// } else {
// "not_editing"
// };
// keymap.add_identifier(identifier);
// });
// }
// }