From c825bb492d11798f48ed0fcff4acbf1a72305440 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 21 Jan 2025 16:02:52 -0300
Subject: [PATCH] assistant2: Propagate move up action to inline picker from
 message editor (#23416)

Release Notes:

- N/A

Co-authored-by: Richard <richard@zed.dev>
---
 crates/assistant2/src/message_editor.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/assistant2/src/message_editor.rs b/crates/assistant2/src/message_editor.rs
index a75ab6416b09cda8321f27f879b4842950a78c28..cc3545889a368a85b3bf27c2687e62ad707358e3 100644
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -241,7 +241,9 @@ impl MessageEditor {
     }
 
     fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
-        if self.context_picker_menu_handle.is_deployed() {
+        if self.context_picker_menu_handle.is_deployed()
+            || self.inline_context_picker_menu_handle.is_deployed()
+        {
             cx.propagate();
         } else {
             cx.focus_view(&self.context_strip);