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

assistant2: Factor out ContextStrip (#22096)

Browse source 
This PR factors a `ContextStrip` view out of the `MessageEditor` so that
we can use it in other places.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-12-16 12:45:01 -05:00 • committed by GitHub
parent ff2ad63037
commit caefdcd7f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 154 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/assistant2/src/context_picker/fetch_context_picker.rs
View file

@ -13,7 +13,7 @@ use workspace::Workspace;
use crate::context::ContextKind;
use crate::context_picker::ContextPicker;
use crate::message_editor::MessageEditor;
use crate::context_strip::ContextStrip;
pub struct FetchContextPicker {
picker: View<Picker<FetchContextPickerDelegate>>,
@ -23,10 +23,10 @@ impl FetchContextPicker {
pub fn new(
context_picker: WeakView<ContextPicker>,
workspace: WeakView<Workspace>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
cx: &mut ViewContext<Self>,
) -> Self {
let delegate = FetchContextPickerDelegate::new(context_picker, workspace, message_editor);
let delegate = FetchContextPickerDelegate::new(context_picker, workspace, context_strip);
let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));
Self { picker }
@ -55,7 +55,7 @@ enum ContentType {
pub struct FetchContextPickerDelegate {
context_picker: WeakView<ContextPicker>,
workspace: WeakView<Workspace>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
url: String,
}
@ -63,12 +63,12 @@ impl FetchContextPickerDelegate {
pub fn new(
context_picker: WeakView<ContextPicker>,
workspace: WeakView<Workspace>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
) -> Self {
FetchContextPickerDelegate {
context_picker,
workspace,
message_editor,
context_strip,
url: String::new(),
}
}
@ -189,9 +189,9 @@ impl PickerDelegate for FetchContextPickerDelegate {
this.update(&mut cx, |this, cx| {
this.delegate
.message_editor
.update(cx, |message_editor, _cx| {
message_editor.insert_context(ContextKind::FetchedUrl, url, text);
.context_strip
.update(cx, |context_strip, _cx| {
context_strip.insert_context(ContextKind::FetchedUrl, url, text);
})
})??;

42
crates/assistant2/src/context_picker/file_context_picker.rs
View file

@ -14,7 +14,7 @@ use workspace::Workspace;
use crate::context::ContextKind;
use crate::context_picker::ContextPicker;
use crate::message_editor::MessageEditor;
use crate::context_strip::ContextStrip;
pub struct FileContextPicker {
picker: View<Picker<FileContextPickerDelegate>>,
@ -24,10 +24,10 @@ impl FileContextPicker {
pub fn new(
context_picker: WeakView<ContextPicker>,
workspace: WeakView<Workspace>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
cx: &mut ViewContext<Self>,
) -> Self {
let delegate = FileContextPickerDelegate::new(context_picker, workspace, message_editor);
let delegate = FileContextPickerDelegate::new(context_picker, workspace, context_strip);
let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));
Self { picker }
@ -49,7 +49,7 @@ impl Render for FileContextPicker {
pub struct FileContextPickerDelegate {
context_picker: WeakView<ContextPicker>,
workspace: WeakView<Workspace>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
matches: Vec<PathMatch>,
selected_index: usize,
}
@ -58,12 +58,12 @@ impl FileContextPickerDelegate {
pub fn new(
context_picker: WeakView<ContextPicker>,
workspace: WeakView<Workspace>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
) -> Self {
Self {
context_picker,
workspace,
message_editor,
context_strip,
matches: Vec::new(),
selected_index: 0,
}
@ -214,24 +214,22 @@ impl PickerDelegate for FileContextPickerDelegate {
let buffer = open_buffer_task.await?;
this.update(&mut cx, |this, cx| {
this.delegate
.message_editor
.update(cx, |message_editor, cx| {
let mut text = String::new();
text.push_str(&codeblock_fence_for_path(Some(&path), None));
text.push_str(&buffer.read(cx).text());
if !text.ends_with('\n') {
text.push('\n');
}
this.delegate.context_strip.update(cx, |context_strip, cx| {
let mut text = String::new();
text.push_str(&codeblock_fence_for_path(Some(&path), None));
text.push_str(&buffer.read(cx).text());
if !text.ends_with('\n') {
text.push('\n');
}
text.push_str("```\n");
text.push_str("```\n");
message_editor.insert_context(
ContextKind::File,
path.to_string_lossy().to_string(),
text,
);
})
context_strip.insert_context(
ContextKind::File,
path.to_string_lossy().to_string(),
text,
);
})
})??;
anyhow::Ok(())

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

@ -7,7 +7,7 @@ use ui::{prelude::*, ListItem};
use crate::context::ContextKind;
use crate::context_picker::ContextPicker;
use crate::message_editor::MessageEditor;
use crate::context_strip::ContextStrip;
use crate::thread::ThreadId;
use crate::thread_store::ThreadStore;
@ -19,11 +19,11 @@ impl ThreadContextPicker {
pub fn new(
thread_store: WeakModel<ThreadStore>,
context_picker: WeakView<ContextPicker>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
cx: &mut ViewContext<Self>,
) -> Self {
let delegate =
ThreadContextPickerDelegate::new(thread_store, context_picker, message_editor);
ThreadContextPickerDelegate::new(thread_store, context_picker, context_strip);
let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));
ThreadContextPicker { picker }
@ -51,7 +51,7 @@ struct ThreadContextEntry {
pub struct ThreadContextPickerDelegate {
thread_store: WeakModel<ThreadStore>,
context_picker: WeakView<ContextPicker>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
matches: Vec<ThreadContextEntry>,
selected_index: usize,
}
@ -60,12 +60,12 @@ impl ThreadContextPickerDelegate {
pub fn new(
thread_store: WeakModel<ThreadStore>,
context_picker: WeakView<ContextPicker>,
message_editor: WeakView<MessageEditor>,
context_strip: WeakView<ContextStrip>,
) -> Self {
ThreadContextPickerDelegate {
thread_store,
context_picker,
message_editor,
context_strip,
matches: Vec::new(),
selected_index: 0,
}
@ -157,8 +157,8 @@ impl PickerDelegate for ThreadContextPickerDelegate {
return;
};
self.message_editor
.update(cx, |message_editor, cx| {
self.context_strip
.update(cx, |context_strip, cx| {
let text = thread.update(cx, |thread, _cx| {
let mut text = String::new();
@ -177,7 +177,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
text
});
message_editor.insert_context(ContextKind::Thread, entry.summary.clone(), text);
context_strip.insert_context(ContextKind::Thread, entry.summary.clone(), text);
})
.ok();
}