Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

agent: Fix cmd-f not working when buffer is open (#60750)

Bennet Bo Fenner585e4aab0891
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index f5c2bd2864f..58bfc4b10e7 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -298,13 +298,6 @@
"alt-r": "search::ToggleRegex",
},
},
- {
- "context": "AgentTerminalThread",
- "use_key_equivalents": true,
- "bindings": {
- "ctrl-f": "agent::ToggleSearch",
- },
- },
{
"context": "AcpThreadSearchBar",
"use_key_equivalents": true,
@@ -326,6 +319,7 @@
"context": "AcpThread > Editor",
"use_key_equivalents": true,
"bindings": {
+ "ctrl-f": "agent::ToggleSearch",
"ctrl-alt-pageup": "agent::ScrollOutputPageUp",
"ctrl-alt-pagedown": "agent::ScrollOutputPageDown",
"ctrl-alt-home": "agent::ScrollOutputToTop",
@@ -1271,7 +1265,9 @@
},
{
"context": "AgentPanel > Terminal",
+ "use_key_equivalents": true,
"bindings": {
+ "ctrl-f": "agent::ToggleSearch",
"ctrl-n": "agent::NewThread",
},
},
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index de0f8bd2b46..0bf5b95fe58 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -336,13 +336,6 @@
"alt-cmd-x": "search::ToggleRegex",
},
},
- {
- "context": "AgentTerminalThread",
- "use_key_equivalents": true,
- "bindings": {
- "cmd-f": "agent::ToggleSearch",
- },
- },
{
"context": "AcpThreadSearchBar",
"use_key_equivalents": true,
@@ -364,6 +357,7 @@
"context": "AcpThread > Editor",
"use_key_equivalents": true,
"bindings": {
+ "cmd-f": "agent::ToggleSearch",
"ctrl-pageup": "agent::ScrollOutputPageUp",
"ctrl-pagedown": "agent::ScrollOutputPageDown",
"ctrl-home": "agent::ScrollOutputToTop",
@@ -1341,6 +1335,7 @@
"context": "AgentPanel > Terminal",
"use_key_equivalents": true,
"bindings": {
+ "cmd-f": "agent::ToggleSearch",
"cmd-n": "agent::NewThread",
},
},
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index acc2a82e18e..d373b94f649 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -299,13 +299,6 @@
"alt-r": "search::ToggleRegex",
},
},
- {
- "context": "AgentTerminalThread",
- "use_key_equivalents": true,
- "bindings": {
- "ctrl-f": "agent::ToggleSearch",
- },
- },
{
"context": "AcpThreadSearchBar",
"use_key_equivalents": true,
@@ -327,6 +320,7 @@
"context": "AcpThread > Editor",
"use_key_equivalents": true,
"bindings": {
+ "ctrl-f": "agent::ToggleSearch",
"ctrl-alt-pageup": "agent::ScrollOutputPageUp",
"ctrl-alt-pagedown": "agent::ScrollOutputPageDown",
"ctrl-alt-home": "agent::ScrollOutputToTop",
@@ -1285,6 +1279,7 @@
"context": "AgentPanel > Terminal",
"use_key_equivalents": true,
"bindings": {
+ "ctrl-f": "agent::ToggleSearch",
"ctrl-n": "agent::NewThread",
},
},
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index cc5a6a55bb3..8ff5e046a46 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -6485,7 +6485,6 @@ impl Render for AgentPanel {
.and_then(|terminal_id| self.terminals.get(&terminal_id))
.and_then(|terminal| terminal.search_bar.clone());
let terminal_content = v_flex()
- .key_context("AgentTerminalThread")
.size_full()
.when_some(search_bar, |this, search_bar| {
this.when(!search_bar.read(cx).is_dismissed(), |this| {