assistant2: Remove WeakView<Workspace> optionality for inline assist (#22099)

This PR removes the optionality for the `WeakView<Workspace>` that we
pass to the inline assist.

This was always `Some` in practice, so it seems we don't need to have it
be an `Option`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-12-16 13:26:11 -05:00 committed by GitHub
parent caefdcd7f1
commit eff61ee764
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 20 deletions

View file

@ -82,7 +82,7 @@ impl TerminalInlineAssistant {
pub fn assist(
&mut self,
terminal_view: &View<TerminalView>,
workspace: Option<WeakView<Workspace>>,
workspace: WeakView<Workspace>,
cx: &mut WindowContext,
) {
let terminal = terminal_view.read(cx).terminal().clone();
@ -361,7 +361,7 @@ struct TerminalInlineAssist {
terminal: WeakView<TerminalView>,
prompt_editor: Option<View<PromptEditor>>,
codegen: Model<Codegen>,
workspace: Option<WeakView<Workspace>>,
workspace: WeakView<Workspace>,
_subscriptions: Vec<Subscription>,
}
@ -370,7 +370,7 @@ impl TerminalInlineAssist {
assist_id: TerminalInlineAssistId,
terminal: &View<TerminalView>,
prompt_editor: View<PromptEditor>,
workspace: Option<WeakView<Workspace>>,
workspace: WeakView<Workspace>,
cx: &mut WindowContext,
) -> Self {
let codegen = prompt_editor.read(cx).codegen.clone();
@ -396,11 +396,7 @@ impl TerminalInlineAssist {
if let CodegenStatus::Error(error) = &codegen.read(cx).status {
if assist.prompt_editor.is_none() {
if let Some(workspace) = assist
.workspace
.as_ref()
.and_then(|workspace| workspace.upgrade())
{
if let Some(workspace) = assist.workspace.upgrade() {
let error =
format!("Terminal inline assistant error: {}", error);
workspace.update(cx, |workspace, cx| {