From 1a1451a94367a336550f8c832d4368cfd410e36c Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 29 Nov 2023 22:04:41 -0500
Subject: [PATCH] Fix bug preventing spaces from being used in filename

---
 assets/keymaps/default.json                |  7 ++++++-
 crates/project_panel/src/project_panel.rs  | 14 +++++++++++++-
 crates/project_panel2/src/project_panel.rs | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index ef6a655bdc..2a8d19f882 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -530,12 +530,17 @@
       "alt-cmd-shift-c": "project_panel::CopyRelativePath",
       "f2": "project_panel::Rename",
       "enter": "project_panel::Rename",
-      "space": "project_panel::Open",
       "backspace": "project_panel::Delete",
       "alt-cmd-r": "project_panel::RevealInFinder",
       "alt-shift-f": "project_panel::NewSearchInDirectory"
     }
   },
+  {
+    "context": "ProjectPanel && not_editing",
+    "bindings": {
+      "space": "project_panel::Open"
+    }
+  },
   {
     "context": "CollabPanel && not_editing",
     "bindings": {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index eb124bfca2..875d4d4f83 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -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);
         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>) {
diff --git a/crates/project_panel2/src/project_panel.rs b/crates/project_panel2/src/project_panel.rs
index dc584d52ff..b9b50e0d7f 100644
--- a/crates/project_panel2/src/project_panel.rs
+++ b/crates/project_panel2/src/project_panel.rs
@@ -3011,3 +3011,21 @@ mod tests {
             .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);
+//         });
+//     }
+// }