Allow clients to run Zed tasks on remote projects (#12199)
Release Notes: - Enabled Zed tasks on remote projects with ssh connection string specified --------- Co-authored-by: Conrad Irwin <conrad@zed.dev>
This commit is contained in:
Kirill Bulatov
GitHub
parent
df35fd0026
commit
055a13a9b6
16 changed files with 1250 additions and 600 deletions
|
|
@ -1,11 +1,8 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use ::settings::Settings;
|
||||
use editor::{tasks::task_context, Editor};
|
||||
use gpui::{AppContext, ViewContext, WindowContext};
|
||||
use language::Language;
|
||||
use gpui::{AppContext, Task as AsyncTask, ViewContext, WindowContext};
|
||||
use modal::TasksModal;
|
||||
use project::WorktreeId;
|
||||
use project::{Location, WorktreeId};
|
||||
use workspace::tasks::schedule_task;
|
||||
use workspace::{tasks::schedule_resolved_task, Workspace};
|
||||
|
||||
|
|
@ -34,15 +31,23 @@ pub fn init(cx: &mut AppContext) {
|
|||
if let Some(use_new_terminal) = action.use_new_terminal {
|
||||
original_task.use_new_terminal = use_new_terminal;
|
||||
}
|
||||
let task_context = task_context(workspace, cx);
|
||||
schedule_task(
|
||||
workspace,
|
||||
task_source_kind,
|
||||
&original_task,
|
||||
&task_context,
|
||||
false,
|
||||
cx,
|
||||
)
|
||||
let context_task = task_context(workspace, cx);
|
||||
cx.spawn(|workspace, mut cx| async move {
|
||||
let task_context = context_task.await;
|
||||
workspace
|
||||
.update(&mut cx, |workspace, cx| {
|
||||
schedule_task(
|
||||
workspace,
|
||||
task_source_kind,
|
||||
&original_task,
|
||||
&task_context,
|
||||
false,
|
||||
cx,
|
||||
)
|
||||
})
|
||||
.ok()
|
||||
})
|
||||
.detach()
|
||||
} else {
|
||||
if let Some(resolved) = last_scheduled_task.resolved.as_mut() {
|
||||
if let Some(allow_concurrent_runs) = action.allow_concurrent_runs {
|
||||
|
|
@ -62,7 +67,7 @@ pub fn init(cx: &mut AppContext) {
|
|||
);
|
||||
}
|
||||
} else {
|
||||
toggle_modal(workspace, cx);
|
||||
toggle_modal(workspace, cx).detach();
|
||||
};
|
||||
});
|
||||
},
|
||||
|
|
@ -72,33 +77,52 @@ pub fn init(cx: &mut AppContext) {
|
|||
|
||||
fn spawn_task_or_modal(workspace: &mut Workspace, action: &Spawn, cx: &mut ViewContext<Workspace>) {
|
||||
match &action.task_name {
|
||||
Some(name) => spawn_task_with_name(name.clone(), cx),
|
||||
None => toggle_modal(workspace, cx),
|
||||
Some(name) => spawn_task_with_name(name.clone(), cx).detach_and_log_err(cx),
|
||||
None => toggle_modal(workspace, cx).detach(),
|
||||
}
|
||||
}
|
||||
|
||||
fn toggle_modal(workspace: &mut Workspace, cx: &mut ViewContext<'_, Workspace>) {
|
||||
let inventory = workspace.project().read(cx).task_inventory().clone();
|
||||
fn toggle_modal(workspace: &mut Workspace, cx: &mut ViewContext<'_, Workspace>) -> AsyncTask<()> {
|
||||
let project = workspace.project().clone();
|
||||
let workspace_handle = workspace.weak_handle();
|
||||
let task_context = task_context(workspace, cx);
|
||||
workspace.toggle_modal(cx, |cx| {
|
||||
TasksModal::new(inventory, task_context, workspace_handle, cx)
|
||||
let context_task = task_context(workspace, cx);
|
||||
cx.spawn(|workspace, mut cx| async move {
|
||||
let task_context = context_task.await;
|
||||
workspace
|
||||
.update(&mut cx, |workspace, cx| {
|
||||
if workspace.project().update(cx, |project, cx| {
|
||||
project.is_local() || project.ssh_connection_string(cx).is_some()
|
||||
}) {
|
||||
workspace.toggle_modal(cx, |cx| {
|
||||
TasksModal::new(project, task_context, workspace_handle, cx)
|
||||
})
|
||||
}
|
||||
})
|
||||
.ok();
|
||||
})
|
||||
}
|
||||
|
||||
fn spawn_task_with_name(name: String, cx: &mut ViewContext<Workspace>) {
|
||||
fn spawn_task_with_name(
|
||||
name: String,
|
||||
cx: &mut ViewContext<Workspace>,
|
||||
) -> AsyncTask<anyhow::Result<()>> {
|
||||
cx.spawn(|workspace, mut cx| async move {
|
||||
let context_task =
|
||||
workspace.update(&mut cx, |workspace, cx| task_context(workspace, cx))?;
|
||||
let task_context = context_task.await;
|
||||
let tasks = workspace
|
||||
.update(&mut cx, |workspace, cx| {
|
||||
let (worktree, location) = active_item_selection_properties(workspace, cx);
|
||||
workspace.project().update(cx, |project, cx| {
|
||||
project.task_templates(worktree, location, cx)
|
||||
})
|
||||
})?
|
||||
.await?;
|
||||
|
||||
let did_spawn = workspace
|
||||
.update(&mut cx, |workspace, cx| {
|
||||
let (worktree, language) = active_item_selection_properties(workspace, cx);
|
||||
let tasks = workspace.project().update(cx, |project, cx| {
|
||||
project
|
||||
.task_inventory()
|
||||
.update(cx, |inventory, _| inventory.list_tasks(language, worktree))
|
||||
});
|
||||
let (task_source_kind, target_task) =
|
||||
tasks.into_iter().find(|(_, task)| task.label == name)?;
|
||||
let task_context = task_context(workspace, cx);
|
||||
schedule_task(
|
||||
workspace,
|
||||
task_source_kind,
|
||||
|
|
@ -108,9 +132,7 @@ fn spawn_task_with_name(name: String, cx: &mut ViewContext<Workspace>) {
|
|||
cx,
|
||||
);
|
||||
Some(())
|
||||
})
|
||||
.ok()
|
||||
.flatten()
|
||||
})?
|
||||
.is_some();
|
||||
if !did_spawn {
|
||||
workspace
|
||||
|
|
@ -119,32 +141,38 @@ fn spawn_task_with_name(name: String, cx: &mut ViewContext<Workspace>) {
|
|||
})
|
||||
.ok();
|
||||
}
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.detach();
|
||||
}
|
||||
|
||||
fn active_item_selection_properties(
|
||||
workspace: &Workspace,
|
||||
cx: &mut WindowContext,
|
||||
) -> (Option<WorktreeId>, Option<Arc<Language>>) {
|
||||
) -> (Option<WorktreeId>, Option<Location>) {
|
||||
let active_item = workspace.active_item(cx);
|
||||
let worktree_id = active_item
|
||||
.as_ref()
|
||||
.and_then(|item| item.project_path(cx))
|
||||
.map(|path| path.worktree_id);
|
||||
let language = active_item
|
||||
let location = active_item
|
||||
.and_then(|active_item| active_item.act_as::<Editor>(cx))
|
||||
.and_then(|editor| {
|
||||
editor.update(cx, |editor, cx| {
|
||||
let selection = editor.selections.newest::<usize>(cx);
|
||||
let (buffer, buffer_position, _) = editor
|
||||
.buffer()
|
||||
.read(cx)
|
||||
.point_to_buffer_offset(selection.start, cx)?;
|
||||
buffer.read(cx).language_at(buffer_position)
|
||||
let selection = editor.selections.newest_anchor();
|
||||
let multi_buffer = editor.buffer().clone();
|
||||
let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
|
||||
let (buffer_snapshot, buffer_offset) =
|
||||
multi_buffer_snapshot.point_to_buffer_offset(selection.head())?;
|
||||
let buffer_anchor = buffer_snapshot.anchor_before(buffer_offset);
|
||||
let buffer = multi_buffer.read(cx).buffer(buffer_snapshot.remote_id())?;
|
||||
Some(Location {
|
||||
buffer,
|
||||
range: buffer_anchor..buffer_anchor,
|
||||
})
|
||||
})
|
||||
});
|
||||
(worktree_id, language)
|
||||
(worktree_id, location)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
@ -250,69 +278,84 @@ mod tests {
|
|||
.unwrap();
|
||||
buffer2.update(cx, |this, cx| this.set_language(Some(rust_language), cx));
|
||||
let editor2 = cx.new_view(|cx| Editor::for_buffer(buffer2, Some(project), cx));
|
||||
workspace.update(cx, |this, cx| {
|
||||
this.add_item_to_center(Box::new(editor1.clone()), cx);
|
||||
this.add_item_to_center(Box::new(editor2.clone()), cx);
|
||||
assert_eq!(this.active_item(cx).unwrap().item_id(), editor2.entity_id());
|
||||
assert_eq!(
|
||||
task_context(this, cx),
|
||||
TaskContext {
|
||||
cwd: Some("/dir".into()),
|
||||
task_variables: TaskVariables::from_iter([
|
||||
(VariableName::File, "/dir/rust/b.rs".into()),
|
||||
(VariableName::Filename, "b.rs".into()),
|
||||
(VariableName::RelativeFile, "rust/b.rs".into()),
|
||||
(VariableName::Dirname, "/dir/rust".into()),
|
||||
(VariableName::Stem, "b".into()),
|
||||
(VariableName::WorktreeRoot, "/dir".into()),
|
||||
(VariableName::Row, "1".into()),
|
||||
(VariableName::Column, "1".into()),
|
||||
])
|
||||
}
|
||||
);
|
||||
// And now, let's select an identifier.
|
||||
editor2.update(cx, |this, cx| {
|
||||
this.change_selections(None, cx, |selections| selections.select_ranges([14..18]))
|
||||
});
|
||||
assert_eq!(
|
||||
task_context(this, cx),
|
||||
TaskContext {
|
||||
cwd: Some("/dir".into()),
|
||||
task_variables: TaskVariables::from_iter([
|
||||
(VariableName::File, "/dir/rust/b.rs".into()),
|
||||
(VariableName::Filename, "b.rs".into()),
|
||||
(VariableName::RelativeFile, "rust/b.rs".into()),
|
||||
(VariableName::Dirname, "/dir/rust".into()),
|
||||
(VariableName::Stem, "b".into()),
|
||||
(VariableName::WorktreeRoot, "/dir".into()),
|
||||
(VariableName::Row, "1".into()),
|
||||
(VariableName::Column, "15".into()),
|
||||
(VariableName::SelectedText, "is_i".into()),
|
||||
(VariableName::Symbol, "this_is_a_rust_file".into()),
|
||||
])
|
||||
}
|
||||
);
|
||||
|
||||
// Now, let's switch the active item to .ts file.
|
||||
this.activate_item(&editor1, cx);
|
||||
assert_eq!(
|
||||
task_context(this, cx),
|
||||
TaskContext {
|
||||
cwd: Some("/dir".into()),
|
||||
task_variables: TaskVariables::from_iter([
|
||||
(VariableName::File, "/dir/a.ts".into()),
|
||||
(VariableName::Filename, "a.ts".into()),
|
||||
(VariableName::RelativeFile, "a.ts".into()),
|
||||
(VariableName::Dirname, "/dir".into()),
|
||||
(VariableName::Stem, "a".into()),
|
||||
(VariableName::WorktreeRoot, "/dir".into()),
|
||||
(VariableName::Row, "1".into()),
|
||||
(VariableName::Column, "1".into()),
|
||||
(VariableName::Symbol, "this_is_a_test".into()),
|
||||
])
|
||||
}
|
||||
);
|
||||
let first_context = workspace
|
||||
.update(cx, |workspace, cx| {
|
||||
workspace.add_item_to_center(Box::new(editor1.clone()), cx);
|
||||
workspace.add_item_to_center(Box::new(editor2.clone()), cx);
|
||||
assert_eq!(
|
||||
workspace.active_item(cx).unwrap().item_id(),
|
||||
editor2.entity_id()
|
||||
);
|
||||
task_context(workspace, cx)
|
||||
})
|
||||
.await;
|
||||
assert_eq!(
|
||||
first_context,
|
||||
TaskContext {
|
||||
cwd: Some("/dir".into()),
|
||||
task_variables: TaskVariables::from_iter([
|
||||
(VariableName::File, "/dir/rust/b.rs".into()),
|
||||
(VariableName::Filename, "b.rs".into()),
|
||||
(VariableName::RelativeFile, "rust/b.rs".into()),
|
||||
(VariableName::Dirname, "/dir/rust".into()),
|
||||
(VariableName::Stem, "b".into()),
|
||||
(VariableName::WorktreeRoot, "/dir".into()),
|
||||
(VariableName::Row, "1".into()),
|
||||
(VariableName::Column, "1".into()),
|
||||
])
|
||||
}
|
||||
);
|
||||
|
||||
// And now, let's select an identifier.
|
||||
editor2.update(cx, |editor, cx| {
|
||||
editor.change_selections(None, cx, |selections| selections.select_ranges([14..18]))
|
||||
});
|
||||
|
||||
assert_eq!(
|
||||
workspace
|
||||
.update(cx, |workspace, cx| { task_context(workspace, cx) })
|
||||
.await,
|
||||
TaskContext {
|
||||
cwd: Some("/dir".into()),
|
||||
task_variables: TaskVariables::from_iter([
|
||||
(VariableName::File, "/dir/rust/b.rs".into()),
|
||||
(VariableName::Filename, "b.rs".into()),
|
||||
(VariableName::RelativeFile, "rust/b.rs".into()),
|
||||
(VariableName::Dirname, "/dir/rust".into()),
|
||||
(VariableName::Stem, "b".into()),
|
||||
(VariableName::WorktreeRoot, "/dir".into()),
|
||||
(VariableName::Row, "1".into()),
|
||||
(VariableName::Column, "15".into()),
|
||||
(VariableName::SelectedText, "is_i".into()),
|
||||
(VariableName::Symbol, "this_is_a_rust_file".into()),
|
||||
])
|
||||
}
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
workspace
|
||||
.update(cx, |workspace, cx| {
|
||||
// Now, let's switch the active item to .ts file.
|
||||
workspace.activate_item(&editor1, cx);
|
||||
task_context(workspace, cx)
|
||||
})
|
||||
.await,
|
||||
TaskContext {
|
||||
cwd: Some("/dir".into()),
|
||||
task_variables: TaskVariables::from_iter([
|
||||
(VariableName::File, "/dir/a.ts".into()),
|
||||
(VariableName::Filename, "a.ts".into()),
|
||||
(VariableName::RelativeFile, "a.ts".into()),
|
||||
(VariableName::Dirname, "/dir".into()),
|
||||
(VariableName::Stem, "a".into()),
|
||||
(VariableName::WorktreeRoot, "/dir".into()),
|
||||
(VariableName::Row, "1".into()),
|
||||
(VariableName::Column, "1".into()),
|
||||
(VariableName::Symbol, "this_is_a_test".into()),
|
||||
])
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
pub(crate) fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue