zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #813 from zed-industries/fix-missing-bindings

Browse Source 
Add back key bindings that were removed accidentally
This commit is contained in:
Max Brunsfeld 2022-04-13 11:25:01 -07:00 committed by GitHub
commit 394d0b4cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
assets/keymaps/default.json
View File

@ -53,7 +53,21 @@
"cmd-t": "project_symbols::Toggle",
"cmd-p": "file_finder::Toggle",
"alt-shift-D": "diagnostics::Deploy",
"ctrl-alt-cmd-j": "journal::NewJournalEntry"
"ctrl-alt-cmd-j": "journal::NewJournalEntry",
"cmd-1": [
"workspace::ToggleSidebarItemFocus",
{
"side": "Left",
"item_index": 0
}
],
"cmd-shift-!": [
"workspace::ToggleSidebarItem",
{
"side": "Left",
"item_index": 0
}
]
},
"ProjectSearchBar": {
"enter": "project_search::Search",
@ -205,7 +219,8 @@
"enter": "editor::ConfirmRename"
},
"Editor && showing_completions": {
"enter": "editor::ConfirmCompletion"
"enter": "editor::ConfirmCompletion",
"tab": "editor::ConfirmCompletion"
},
"Editor && showing_code_actions": {
"enter": "editor::ConfirmCodeAction"

15
crates/workspace/src/sidebar.rs
View File

@ -1,7 +1,6 @@
use super::Workspace;
use gpui::{
elements::*, impl_internal_actions, platform::CursorStyle, AnyViewHandle, RenderContext,
};
use gpui::{elements::*, impl_actions, platform::CursorStyle, AnyViewHandle, RenderContext};
use serde::Deserialize;
use std::{cell::RefCell, rc::Rc};
use theme::Theme;
@ -12,7 +11,7 @@ pub struct Sidebar {
width: Rc<RefCell<f32>>,
}
#[derive(Clone, Copy)]
#[derive(Clone, Copy, Deserialize)]
pub enum Side {
Left,
Right,
@ -23,15 +22,15 @@ struct Item {
view: AnyViewHandle,
}
#[derive(Clone)]
#[derive(Clone, Deserialize)]
pub struct ToggleSidebarItem(pub SidebarItemId);
#[derive(Clone)]
#[derive(Clone, Deserialize)]
pub struct ToggleSidebarItemFocus(pub SidebarItemId);
impl_internal_actions!(workspace, [ToggleSidebarItem, ToggleSidebarItemFocus]);
impl_actions!(workspace, [ToggleSidebarItem, ToggleSidebarItemFocus]);
#[derive(Clone)]
#[derive(Clone, Deserialize)]
pub struct SidebarItemId {
pub side: Side,
pub item_index: usize,