diff --git a/crates/ai/src/assistant.rs b/crates/ai/src/assistant.rs index 7631381273..9ca54e661a 100644 --- a/crates/ai/src/assistant.rs +++ b/crates/ai/src/assistant.rs @@ -39,7 +39,7 @@ use std::{ time::Duration, }; use theme::AssistantStyle; -use util::{channel::ReleaseChannel, paths::CONVERSATIONS_DIR, post_inc, ResultExt, TryFutureExt}; +use util::{paths::CONVERSATIONS_DIR, post_inc, ResultExt, TryFutureExt}; use workspace::{ dock::{DockPosition, Panel}, searchable::Direction, @@ -62,12 +62,6 @@ actions!( ); pub fn init(cx: &mut AppContext) { - if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Stable { - cx.update_default_global::(move |filter, _cx| { - filter.filtered_namespaces.insert("assistant"); - }); - } - settings::register::(cx); cx.add_action( |this: &mut AssistantPanel, diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index bcdfe57a46..cbd67a84cf 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -361,15 +361,15 @@ pub fn initialize_workspace( let project_panel = ProjectPanel::load(workspace_handle.clone(), cx.clone()); let terminal_panel = TerminalPanel::load(workspace_handle.clone(), cx.clone()); - let assistant_panel = if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Stable { - None - } else { - Some(AssistantPanel::load(workspace_handle.clone(), cx.clone()).await?) - }; - let (project_panel, terminal_panel) = futures::try_join!(project_panel, terminal_panel)?; + let assistant_panel = AssistantPanel::load(workspace_handle.clone(), cx.clone()); + let (project_panel, terminal_panel, assistant_panel) = + futures::try_join!(project_panel, terminal_panel, assistant_panel)?; workspace_handle.update(&mut cx, |workspace, cx| { let project_panel_position = project_panel.position(cx); workspace.add_panel(project_panel, cx); + workspace.add_panel(terminal_panel, cx); + workspace.add_panel(assistant_panel, cx); + if !was_deserialized && workspace .project() @@ -383,13 +383,7 @@ pub fn initialize_workspace( { workspace.toggle_dock(project_panel_position, cx); } - cx.focus_self(); - - workspace.add_panel(terminal_panel, cx); - if let Some(assistant_panel) = assistant_panel { - workspace.add_panel(assistant_panel, cx); - } })?; Ok(()) })