Add ability to bind to pane::RevealInProjectPanel (#7487)

Previously it wasn't possible to create a keybinding for this action because it required an argument. Now the action takes the active item of the pane and if it's a multi-buffer the first one. This also adds a default keybinding for Vim mode: `-` will reveal the file in the project panel. Fixes #7485. Release Notes: - Added `pane::RevealInProjectPanel` as an action in the command palette. ([#7485](https://github.com/zed-industries/zed/issues/7485)).

Thorsten Ball committed 2 years ago

Commit db39b9d1 parent 2aa8ccd3 files · +17 −10Browse files

Unified · Split

3 files

assets/keymaps/vim.json +2 −1
crates/editor/src/actions.rs +1 −1
crates/workspace/src/pane.rs +14 −8

assets/keymaps/vim.json+2−1

       "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w n": ["workspace::NewFileInDirection", "Up"],
-      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"]
+      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"],
+      "-": "pane::RevealInProjectPanel"
     }
   },
   {

crates/editor/src/actions.rs+1−1

@@ -112,7 +112,7 @@ impl_actions!( · 111 unmodified lines
112	MoveUpByLines,	112	MoveUpByLines,
113	MoveDownByLines,	113	MoveDownByLines,
114	SelectUpByLines,	114	SelectUpByLines,
115	SelectDownByLines,	115	SelectDownByLines
116	]	116	]
117	);	117	);
118		118

crates/workspace/src/pane.rs+14−8

     pub save_intent: Option<SaveIntent>,
 }
-#[derive(Clone, PartialEq, Debug, Deserialize)]
+#[derive(Clone, PartialEq, Debug, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct RevealInProjectPanel {
-    pub entry_id: u64,
+    pub entry_id: Option<u64>,
 }
 impl_actions!(
                         let entry_id = entry.to_proto();
                         menu = menu.separator().entry(
                             "Reveal In Project Panel",
-                            Some(Box::new(RevealInProjectPanel { entry_id })),
+                            Some(Box::new(RevealInProjectPanel {
+                                entry_id: Some(entry_id),
+                            })),
                             cx.handler_for(&pane, move |pane, cx| {
                                 pane.project.update(cx, |_, cx| {
                                     cx.emit(project::Event::RevealInProjectPanel(
             )
             .on_action(
                 cx.listener(|pane: &mut Self, action: &RevealInProjectPanel, cx| {
-                    pane.project.update(cx, |_, cx| {
+                    let entry_id = action
-                        cx.emit(project::Event::RevealInProjectPanel(
+                        .entry_id
-                            ProjectEntryId::from_proto(action.entry_id),
+                        .map(ProjectEntryId::from_proto)
-                        ))
+                        .or_else(|| pane.active_item()?.project_entry_ids(cx).first().copied());
-                    })
+                    if let Some(entry_id) = entry_id {
+                        pane.project.update(cx, |_, cx| {
+                            cx.emit(project::Event::RevealInProjectPanel(entry_id))
+                        });
+                    }
                 }),
             )
             .when(self.active_item().is_some(), |pane| {