mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 10:59:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

outline_panel: Fix j and k not working in outline panel filter (#17293)
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
Details
CI / (macOS) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Run Clippy and tests (push) Waiting to run
Details
CI / (Windows) Run Clippy and tests (push) Waiting to run
Details
CI / Create a macOS bundle (push) Blocked by required conditions
Details
CI / Create a Linux bundle (push) Blocked by required conditions
Details
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Details
Deploy Docs / Deploy Docs (push) Waiting to run
Details
Docs / Check formatting (push) Waiting to run
Details

Browse source 
Closes #17248

Release Notes:

- Fixed outline panel filter not working for certain Vim bindings
([#17248](https://github.com/zed-industries/zed/issues/17248))
This commit is contained in:
CharlesChen0823 2024-09-04 17:27:07 +08:00 committed by GitHub
parent 5b0d64890f
commit 072513f59f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/keymaps/default-linux.json
View file

@ -521,7 +521,7 @@
} }
}, },
{ {
"context": "OutlinePanel", "context": "OutlinePanel && not_editing",
"bindings": { "bindings": {
"escape": "menu::Cancel", "escape": "menu::Cancel",
"left": "outline_panel::CollapseSelectedEntry", "left": "outline_panel::CollapseSelectedEntry",

2
assets/keymaps/default-macos.json
View file

@ -528,7 +528,7 @@
} }
}, },
{ {
"context": "OutlinePanel", "context": "OutlinePanel && not_editing",
"bindings": { "bindings": {
"escape": "menu::Cancel", "escape": "menu::Cancel",
"left": "outline_panel::CollapseSelectedEntry", "left": "outline_panel::CollapseSelectedEntry",

2
assets/keymaps/vim.json
View file

@ -489,7 +489,7 @@
} }
}, },
{ {
"context": "OutlinePanel", "context": "OutlinePanel && not_editing",
"bindings": { "bindings": {
"j": "menu::SelectNext", "j": "menu::SelectNext",
"k": "menu::SelectPrev", "k": "menu::SelectPrev",

8
crates/outline_panel/src/outline_panel.rs
View file

@ -722,10 +722,16 @@ impl OutlinePanel {
); );
} }
fn dispatch_context(&self, _: &ViewContext<Self>) -> KeyContext { fn dispatch_context(&self, cx: &ViewContext<Self>) -> KeyContext {
let mut dispatch_context = KeyContext::new_with_defaults(); let mut dispatch_context = KeyContext::new_with_defaults();
dispatch_context.add("OutlinePanel"); dispatch_context.add("OutlinePanel");
dispatch_context.add("menu"); dispatch_context.add("menu");
let identifier = if self.filter_editor.focus_handle(cx).is_focused(cx) {
"editing"
} else {
"not_editing"
};
dispatch_context.add(identifier);
dispatch_context dispatch_context
} }