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

File context for assistant panel (#9712)

Browse source 
Introducing the Active File Context portion of #9705. When someone is in
the assistant panel it now includes the active file as a system message
on send while showing them a nice little display in the lower right:


![image](https://github.com/zed-industries/zed/assets/836375/9abc56e0-e8f2-45ee-9e7e-b83b28b483ea)

For this iteration, I'd love to see the following before we land this:

* [x] Toggle-able context - user should be able to disable sending this
context
* [x] Show nothing if there is no context coming in
* [x] Update token count as we change items
* [x] Listen for a more finely scoped event for when the active item
changes
* [x] Create a global for pulling a file icon based on a path. Zed's
main way to do this is nested within project panel's `FileAssociation`s.
* [x] Get the code fence name for a Language for the system prompt
* [x] Update the token count when the buffer content changes

I'm seeing this PR as the foundation for providing other kinds of
context -- diagnostic summaries, failing tests, additional files, etc.

Release Notes:

- Added file context to assistant chat panel
([#9705](https://github.com/zed-industries/zed/issues/9705)).

<img width="1558" alt="image"
src="https://github.com/zed-industries/zed/assets/836375/86eb7e50-3e28-4754-9c3f-895be588616d">

---------

Co-authored-by: Conrad Irwin <conrad@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
This commit is contained in:
Kyle Kelley 2024-03-29 13:55:01 -07:00 • committed by GitHub
parent df3050dac1
commit d77e553466
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 377 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/project_panel/src/project_panel.rs
View file

@ -1,11 +1,10 @@
pub mod file_associations;
mod project_panel_settings;
use client::{ErrorCode, ErrorExt};
use settings::Settings;
use db::kvp::KEY_VALUE_STORE;
use editor::{actions::Cancel, items::entry_git_aware_label_color, scroll::Autoscroll, Editor};
use file_associations::FileAssociations;
use file_icons::FileIcons;
use anyhow::{anyhow, Result};
use collections::{hash_map, HashMap};
@ -142,7 +141,7 @@ pub fn init_settings(cx: &mut AppContext) {
pub fn init(assets: impl AssetSource, cx: &mut AppContext) {
init_settings(cx);
file_associations::init(assets, cx);
file_icons::init(assets, cx);
cx.observe_new_views(|workspace: &mut Workspace, _| {
workspace.register_action(|workspace, _: &ToggleFocus, cx| {
@ -229,7 +228,7 @@ impl ProjectPanel {
})
.detach();
cx.observe_global::<FileAssociations>(|_, cx| {
cx.observe_global::<FileIcons>(|_, cx| {
cx.notify();
})
.detach();
@ -1329,16 +1328,16 @@ impl ProjectPanel {
let icon = match entry.kind {
EntryKind::File(_) => {
if show_file_icons {
FileAssociations::get_icon(&entry.path, cx)
FileIcons::get_icon(&entry.path, cx)
} else {
None
}
}
_ => {
if show_folder_icons {
FileAssociations::get_folder_icon(is_expanded, cx)
FileIcons::get_folder_icon(is_expanded, cx)
} else {
FileAssociations::get_chevron_icon(is_expanded, cx)
FileIcons::get_chevron_icon(is_expanded, cx)
}
}
};