Do not suggest file in inline assistant

zed-industries · Dec 31, 2024 · 2fb529f · 2fb529f
1 parent 5b3e3f3
commit 2fb529f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/crates/assistant2/src/context_strip.rs b/crates/assistant2/src/context_strip.rs
@@ -24,6 +24,11 @@ pub struct ContextStrip {
     _subscription: Option<Subscription>,
 }
 
+pub enum SuggestContextKind {
+    File,
+    Thread,
+}
+
 #[derive(Clone)]
 pub struct SuggestedContext {
     entry_id: ProjectEntryId,
@@ -38,10 +43,19 @@ impl ContextStrip {
         thread_store: Option<WeakModel<ThreadStore>>,
         focus_handle: FocusHandle,
         context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
+        suggest_context_kind: SuggestContextKind,
         cx: &mut ViewContext<Self>,
     ) -> Self {
         let subscription = if let Some(workspace) = workspace.upgrade() {
-            Some(cx.subscribe(&workspace, Self::handle_workspace_event))
+            match suggest_context_kind {
+                SuggestContextKind::File => {
+                    Some(cx.subscribe(&workspace, Self::handle_workspace_event))
+                }
+                SuggestContextKind::Thread => {
+                    // TODO: Suggest current thread
+                    None
+                }
+            }
         } else {
             None
         };

diff --git a/crates/assistant2/src/inline_prompt_editor.rs b/crates/assistant2/src/inline_prompt_editor.rs
@@ -2,7 +2,7 @@ use crate::assistant_model_selector::AssistantModelSelector;
 use crate::buffer_codegen::BufferCodegen;
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
-use crate::context_strip::ContextStrip;
+use crate::context_strip::{ContextStrip, SuggestContextKind};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::ThreadStore;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
@@ -793,6 +793,7 @@ impl PromptEditor<BufferCodegen> {
                     thread_store.clone(),
                     prompt_editor.focus_handle(cx),
                     context_picker_menu_handle.clone(),
+                    SuggestContextKind::Thread,
                     cx,
                 )
             }),
@@ -932,6 +933,7 @@ impl PromptEditor<TerminalCodegen> {
                     thread_store.clone(),
                     prompt_editor.focus_handle(cx),
                     context_picker_menu_handle.clone(),
+                    SuggestContextKind::Thread,
                     cx,
                 )
             }),

diff --git a/crates/assistant2/src/message_editor.rs b/crates/assistant2/src/message_editor.rs
@@ -20,7 +20,7 @@ use workspace::Workspace;
 use crate::assistant_model_selector::AssistantModelSelector;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
-use crate::context_strip::ContextStrip;
+use crate::context_strip::{ContextStrip, SuggestContextKind};
 use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
 use crate::{Chat, ToggleContextPicker, ToggleModelSelector};
@@ -87,6 +87,7 @@ impl MessageEditor {
                     Some(thread_store.clone()),
                     editor.focus_handle(cx),
                     context_picker_menu_handle.clone(),
+                    SuggestContextKind::File,
                     cx,
                 )
             }),