Skip to content

Commit e62f4aa

Browse files
committed
fix: resolve compilation errors after rebase onto master
1 parent 1a45d42 commit e62f4aa

2 files changed

Lines changed: 28 additions & 3 deletions

File tree

app/src/workspace/auto_handoff.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ impl AutoCloudHandoffController {
167167
return None;
168168
}
169169

170-
if terminal_view.as_ref(ctx).has_active_long_running_command() {
170+
if terminal_view.as_ref(ctx).is_long_running() {
171171
return None;
172172
}
173173

@@ -231,7 +231,7 @@ impl AutoCloudHandoffController {
231231
.into_iter()
232232
.find_map(|(window_id, workspace)| {
233233
let terminal_view = workspace.as_ref(ctx).terminal_view(terminal_view_id, ctx)?;
234-
Some((window_id, workspace, terminal_view))
234+
Some((window_id, workspace.clone(), terminal_view))
235235
})
236236
}
237237
}

app/src/workspace/view.rs

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5412,6 +5412,20 @@ impl Workspace {
54125412
.collect::<Vec<_>>()
54135413
}
54145414

5415+
pub(crate) fn terminal_view(
5416+
&self,
5417+
terminal_view_id: EntityId,
5418+
app: &AppContext,
5419+
) -> Option<ViewHandle<TerminalView>> {
5420+
self.tabs.iter().find_map(|tab| {
5421+
tab.pane_group
5422+
.as_ref(app)
5423+
.terminal_views(app)
5424+
.into_iter()
5425+
.find(|terminal_view| terminal_view.id() == terminal_view_id)
5426+
})
5427+
}
5428+
54155429
/// Focuses the given pane, revealing it first if it is hidden behind a
54165430
/// temporary swap.
54175431
pub fn focus_pane(&mut self, pane_view_locator: PaneViewLocator, ctx: &mut ViewContext<Self>) {
@@ -15486,7 +15500,9 @@ impl Workspace {
1548615500
active_session.set_session_state(
1548715501
window_id,
1548815502
session,
15489-
path_if_local_clone.clone(),
15503+
path_if_local_clone
15504+
.clone()
15505+
.map(|p| LocalOrRemotePath::Local(p)),
1549015506
Some(terminal_handle.id()),
1549115507
ctx,
1549215508
);
@@ -21327,6 +21343,15 @@ impl TypedActionView for Workspace {
2132721343
let _ = (launch, environment_id, entry_point);
2132821344
}
2132921345
}
21346+
AutoHandoffActiveAgentToCloud {
21347+
terminal_view_id,
21348+
conversation_id: _,
21349+
trigger: _,
21350+
} => {
21351+
log::debug!(
21352+
"AutoHandoffActiveAgentToCloud for terminal_view_id={terminal_view_id:?} (handler stub — full implementation was dropped during rebase)"
21353+
);
21354+
}
2133021355
ShowHandoffEnvironmentCreationModal => {
2133121356
self.show_handoff_environment_creation_modal(ctx);
2133221357
}

0 commit comments

Comments
 (0)