Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant2: Push logic for adding thread context down into the ContextStore (#22855)

Browse source 
This PR takes the logic for adding thread context out of the
`ThreadContextPicker` and pushes it down into the `ContextStore`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-01-08 14:54:54 -05:00 • committed by GitHub
parent b78396505f
commit 7e39023ea5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/assistant2/src/context_picker/thread_context_picker.rs
View file

@ -167,13 +167,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
}; };
self.context_store self.context_store
.update(cx, |context_store, cx| { .update(cx, |context_store, cx| context_store.add_thread(thread, cx))
if let Some(context_id) = context_store.included_thread(&entry.id) {
context_store.remove_context(&context_id);
} else {
context_store.insert_thread(thread.read(cx));
}
})
.ok(); .ok();
match self.confirm_behavior { match self.confirm_behavior {
@ -199,8 +193,8 @@ impl PickerDelegate for ThreadContextPickerDelegate {
) -> Option<Self::ListItem> { ) -> Option<Self::ListItem> {
let thread = &self.matches[ix]; let thread = &self.matches[ix];
let added = self.context_store.upgrade().map_or(false, |ctx_store| { let added = self.context_store.upgrade().map_or(false, |context_store| {
ctx_store.read(cx).included_thread(&thread.id).is_some() context_store.read(cx).included_thread(&thread.id).is_some()
}); });
Some( Some(

10
crates/assistant2/src/context_store.rs
View file

@ -4,7 +4,7 @@ use std::sync::Arc;
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, bail, Result};
use collections::{HashMap, HashSet}; use collections::{HashMap, HashSet};
use gpui::{ModelContext, SharedString, Task, WeakView}; use gpui::{Model, ModelContext, SharedString, Task, WeakView};
use language::Buffer; use language::Buffer;
use project::{ProjectPath, Worktree}; use project::{ProjectPath, Worktree};
use workspace::Workspace; use workspace::Workspace;
@ -229,6 +229,14 @@ impl ContextStore {
}); });
} }
pub fn add_thread(&mut self, thread: Model<Thread>, cx: &mut ModelContext<Self>) {
if let Some(context_id) = self.included_thread(&thread.read(cx).id()) {
self.remove_context(&context_id);
} else {
self.insert_thread(thread.read(cx));
}
}
pub fn insert_thread(&mut self, thread: &Thread) { pub fn insert_thread(&mut self, thread: &Thread) {
let context_id = self.next_context_id.post_inc(); let context_id = self.next_context_id.post_inc();
self.threads.insert(thread.id().clone(), context_id); self.threads.insert(thread.id().clone(), context_id);