From fd8eeb537dec20795b6cd03fb2a46f5c9a47ae35 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Thu, 24 Apr 2025 13:17:35 +0000 Subject: [PATCH] Fix ctrl-enter opening inline-assistant in assistant text threads (#29313) Closes: https://github.com/zed-industries/zed/issues/24501 This has been broken for a while on linux (at least since Feb 8th!) for Assistant1. It is also broken for Text Threads in Assitant2 (on macos and linux). This should fix both. Potentially related: - https://github.com/zed-industries/zed/pull/29107 Release Notes: - Fix for `ctrl-enter` shortcut in Assistant text threads incorrectly opening inline assist instead of triggering Send. Co-authored-by: Conrad Irwin --- assets/keymaps/default-linux.json | 2 +- assets/keymaps/default-macos.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 4f2798796c..e320714be7 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -675,7 +675,7 @@ } }, { - "context": "Editor && mode == full", + "context": "!ContextEditor > Editor && mode == full", "bindings": { "alt-enter": "editor::OpenExcerpts", "shift-enter": "editor::ExpandExcerpts", diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index ff0948c2b1..19f16a1530 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -738,7 +738,7 @@ } }, { - "context": "Editor && mode == full", + "context": "!ContextEditor > Editor && mode == full", "use_key_equivalents": true, "bindings": { "alt-enter": "editor::OpenExcerpts",