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

Remove assistant crate (#30168)

Browse source 
This PR removes the `assistant` crate, as it is no longer used.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-05-07 19:05:38 -04:00 • committed by GitHub
parent 011aa715cf
commit 6ac2f4e6a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 143 additions and 7541 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/zed/Cargo.toml
View file

@ -20,7 +20,6 @@ agent.workspace = true
anyhow.workspace = true
askpass.workspace = true
assets.workspace = true
assistant.workspace = true
assistant_context_editor.workspace = true
assistant_settings.workspace = true
assistant_tools.workspace = true

6
crates/zed/src/main.rs
View file

@ -503,12 +503,6 @@ fn main() {
cx,
);
let prompt_builder = PromptBuilder::load(app_state.fs.clone(), stdout_is_a_pty(), cx);
assistant::init(
app_state.fs.clone(),
app_state.client.clone(),
prompt_builder.clone(),
cx,
);
agent::init(
app_state.fs.clone(),
app_state.client.clone(),

36
crates/zed/src/zed.rs
View file

@ -433,31 +433,19 @@ fn initialize_panels(
})?;
let is_assistant2_enabled = !cfg!(test);
let (assistant_panel, assistant2_panel) = if is_assistant2_enabled {
let assistant2_panel =
let agent_panel = if is_assistant2_enabled {
let agent_panel =
agent::AssistantPanel::load(workspace_handle.clone(), prompt_builder, cx.clone())
.await?;
(None, Some(assistant2_panel))
Some(agent_panel)
} else {
let assistant_panel = assistant::AssistantPanel::load(
workspace_handle.clone(),
prompt_builder.clone(),
cx.clone(),
)
.await?;
(Some(assistant_panel), None)
None
};
workspace_handle.update_in(cx, |workspace, window, cx| {
if let Some(assistant2_panel) = assistant2_panel {
workspace.add_panel(assistant2_panel, window, cx);
}
if let Some(assistant_panel) = assistant_panel {
workspace.add_panel(assistant_panel, window, cx);
if let Some(agent_panel) = agent_panel {
workspace.add_panel(agent_panel, window, cx);
}
// Register the actions that are shared between `assistant` and `assistant2`.
@ -475,15 +463,6 @@ fn initialize_panels(
workspace
.register_action(agent::AssistantPanel::toggle_focus)
.register_action(agent::InlineAssistant::inline_assist);
} else {
<dyn AssistantPanelDelegate>::set_global(
Arc::new(assistant::assistant_panel::ConcreteAssistantPanelDelegate),
cx,
);
workspace
.register_action(assistant::AssistantPanel::toggle_focus)
.register_action(assistant::AssistantPanel::inline_assist);
}
})?;
@ -4241,10 +4220,11 @@ mod tests {
web_search::init(cx);
web_search_providers::init(app_state.client.clone(), cx);
let prompt_builder = PromptBuilder::load(app_state.fs.clone(), false, cx);
assistant::init(
agent::init(
app_state.fs.clone(),
app_state.client.clone(),
prompt_builder.clone(),
app_state.languages.clone(),
cx,
);
repl::init(app_state.fs.clone(), cx);