# Objective Part of EP-10 Closes EP-118 - Describe the objective or issue this PR addresses. - If you're fixing a specific issue, use "Fixes #X" for each issue as [described in the GitHub docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword). ## Solution - Describe the solution used to achieve the objective above. ## Testing - Did you test these changes? If so, how? - Are there any parts that need more testing? - How can other people (reviewers) test your changes? Is there anything specific they need to know? - If relevant, what platforms did you test these changes on, and are there any important ones you can't test? ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase > This section is optional. If this PR does not include a visual change or does not add a new user-facing feature, you can delete this section. - Help others understand the result of this PR by showcasing your awesome work! - If this PR includes a visual change, consider adding a screenshot, GIF, or video - A before/after comparison is very useful for changes to existing features! While a showcase should aim to be brief and digestible, you can use a toggleable section to save space on longer showcases: <details> <summary>Click to view showcase</summary> My super cool demos here </details> --- Release Notes: - N/A or Added/Fixed/Improved ... Co-authored-by: Nbarry <nbarry@zed.dev>
394 lines
13 KiB
Rust
394 lines
13 KiB
Rust
use crate::{
|
|
example::{Example, ExampleState},
|
|
git,
|
|
headless::EpAppState,
|
|
progress::{ExampleProgress, InfoStyle, Step, StepProgress},
|
|
};
|
|
use anyhow::{Context as _, Result};
|
|
use edit_prediction::{
|
|
EditPredictionStore,
|
|
cursor_excerpt::{compute_cursor_excerpt, compute_syntax_ranges},
|
|
udiff::{OpenedBuffers, refresh_worktree_entries, strip_diff_path_prefix},
|
|
};
|
|
use futures::AsyncWriteExt as _;
|
|
use gpui::{AsyncApp, Entity};
|
|
use language::{Anchor, Buffer, LanguageNotFound, ToOffset};
|
|
use project::{Project, ProjectPath, buffer_store::BufferStoreEvent};
|
|
use std::{fs, path::PathBuf, sync::Arc};
|
|
use zeta_prompt::Zeta2PromptInput;
|
|
|
|
pub async fn run_load_project(
|
|
example: &mut Example,
|
|
app_state: Arc<EpAppState>,
|
|
example_progress: &ExampleProgress,
|
|
mut cx: AsyncApp,
|
|
) -> Result<()> {
|
|
if example.state.is_some() {
|
|
return Ok(());
|
|
}
|
|
|
|
let progress = example_progress.start(Step::LoadProject);
|
|
|
|
let project = setup_project(example, &app_state, &progress, &mut cx).await?;
|
|
|
|
progress.set_substatus("applying edit history");
|
|
let open_buffers = apply_edit_history(example, &project, &mut cx).await?;
|
|
|
|
let ep_store = cx
|
|
.update(|cx| EditPredictionStore::try_global(cx))
|
|
.context("EditPredictionStore not initialized")?;
|
|
|
|
let recent_paths: Vec<ProjectPath> = open_buffers
|
|
.buffers()
|
|
.filter_map(|buffer| {
|
|
buffer.read_with(&cx, |buffer, cx| {
|
|
buffer
|
|
.file()
|
|
.map(|file| ProjectPath::from_file(file.as_ref(), cx))
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
ep_store.update(&mut cx, |store, cx| {
|
|
store.set_recent_paths_for_project(&project, recent_paths, cx);
|
|
});
|
|
|
|
progress.set_substatus("resolving cursor");
|
|
let (buffer, cursor_position) =
|
|
cursor_position(example, &project, &open_buffers, &mut cx).await?;
|
|
buffer
|
|
.read_with(&cx, |buffer, _| buffer.parsing_idle())
|
|
.await;
|
|
|
|
let events: Vec<Arc<zeta_prompt::Event>> = ep_store.update(&mut cx, |store, cx| {
|
|
store
|
|
.edit_history_for_project(&project, cx)
|
|
.into_iter()
|
|
.map(|e| e.event)
|
|
.collect()
|
|
});
|
|
|
|
let existing_related_files = example
|
|
.prompt_inputs
|
|
.take()
|
|
.and_then(|inputs| inputs.related_files);
|
|
|
|
let (prompt_inputs, language_name) = buffer.read_with(&cx, |buffer, _cx| {
|
|
let snapshot = buffer.snapshot();
|
|
let cursor_offset = cursor_position.to_offset(&snapshot);
|
|
let language_name = buffer
|
|
.language()
|
|
.map(|l| l.name().to_string())
|
|
.unwrap_or_else(|| "Unknown".to_string());
|
|
|
|
let (excerpt_point_range, excerpt_offset_range, cursor_offset_in_excerpt) =
|
|
compute_cursor_excerpt(&snapshot, cursor_offset);
|
|
|
|
let cursor_excerpt: Arc<str> = buffer
|
|
.text_for_range(excerpt_offset_range.clone())
|
|
.collect::<String>()
|
|
.into();
|
|
let syntax_ranges = compute_syntax_ranges(&snapshot, cursor_offset, &excerpt_offset_range);
|
|
let excerpt_ranges = zeta_prompt::compute_legacy_excerpt_ranges(
|
|
&cursor_excerpt,
|
|
cursor_offset_in_excerpt,
|
|
&syntax_ranges,
|
|
);
|
|
|
|
(
|
|
Zeta2PromptInput {
|
|
cursor_path: example.spec.cursor_path.clone(),
|
|
cursor_excerpt,
|
|
cursor_offset_in_excerpt,
|
|
excerpt_start_row: Some(excerpt_point_range.start.row),
|
|
events,
|
|
related_files: existing_related_files,
|
|
active_buffer_diagnostics: vec![],
|
|
excerpt_ranges,
|
|
syntax_ranges: Some(syntax_ranges),
|
|
in_open_source_repo: false,
|
|
can_collect_data: false,
|
|
repo_url: None,
|
|
},
|
|
language_name,
|
|
)
|
|
});
|
|
|
|
progress.set_info(language_name, InfoStyle::Normal);
|
|
|
|
example.prompt_inputs = Some(prompt_inputs);
|
|
example.state = Some(ExampleState {
|
|
buffer,
|
|
project,
|
|
cursor_position,
|
|
_open_buffers: open_buffers,
|
|
});
|
|
Ok(())
|
|
}
|
|
|
|
async fn cursor_position(
|
|
example: &Example,
|
|
project: &Entity<Project>,
|
|
open_buffers: &OpenedBuffers,
|
|
cx: &mut AsyncApp,
|
|
) -> Result<(Entity<Buffer>, Anchor)> {
|
|
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
|
|
let result = language_registry
|
|
.load_language_for_file_path(&example.spec.cursor_path)
|
|
.await;
|
|
|
|
if let Err(error) = result
|
|
&& !error.is::<LanguageNotFound>()
|
|
{
|
|
return Err(error);
|
|
}
|
|
|
|
let cursor_path_str = example.spec.cursor_path.to_string_lossy();
|
|
// Also try cursor path with first component stripped - old examples may have
|
|
// paths like "zed/crates/foo.rs" instead of "crates/foo.rs".
|
|
let cursor_path_without_prefix: PathBuf =
|
|
example.spec.cursor_path.components().skip(1).collect();
|
|
let cursor_path_without_prefix_str = cursor_path_without_prefix.to_string_lossy();
|
|
|
|
// We try open_buffers first because the file might be new and not saved to disk
|
|
let cursor_buffer = if let Some(buffer) = open_buffers.get(cursor_path_str.as_ref()) {
|
|
buffer.clone()
|
|
} else if let Some(buffer) = open_buffers.get(cursor_path_without_prefix_str.as_ref()) {
|
|
buffer.clone()
|
|
} else {
|
|
// Since the worktree scanner is disabled, manually refresh entries for the cursor path.
|
|
if let Some(worktree) = project.read_with(cx, |project, cx| project.worktrees(cx).next()) {
|
|
refresh_worktree_entries(&worktree, [&*example.spec.cursor_path], cx).await?;
|
|
}
|
|
|
|
let cursor_path = project
|
|
.read_with(cx, |project, cx| {
|
|
project
|
|
.find_project_path(&example.spec.cursor_path, cx)
|
|
.or_else(|| project.find_project_path(&cursor_path_without_prefix, cx))
|
|
})
|
|
.with_context(|| {
|
|
format!(
|
|
"failed to find cursor path {}",
|
|
example.spec.cursor_path.display()
|
|
)
|
|
})?;
|
|
|
|
project
|
|
.update(cx, |project, cx| project.open_buffer(cursor_path, cx))
|
|
.await?
|
|
};
|
|
|
|
let (cursor_excerpt, cursor_offset_within_excerpt) = example.spec.cursor_excerpt()?;
|
|
|
|
let excerpt_offset = cursor_buffer.read_with(&*cx, |buffer, _cx| {
|
|
let text = buffer.text();
|
|
|
|
let mut matches = text.match_indices(&cursor_excerpt);
|
|
let (excerpt_offset, _) = matches.next().with_context(|| {
|
|
format!("Cursor excerpt did not exist in buffer:\n\n{cursor_excerpt}\n",)
|
|
})?;
|
|
anyhow::ensure!(
|
|
matches.next().is_none(),
|
|
"More than one cursor position match found",
|
|
);
|
|
Ok(excerpt_offset)
|
|
})?;
|
|
|
|
let cursor_offset = excerpt_offset + cursor_offset_within_excerpt;
|
|
let cursor_anchor =
|
|
cursor_buffer.read_with(&*cx, |buffer, _| buffer.anchor_after(cursor_offset));
|
|
|
|
Ok((cursor_buffer, cursor_anchor))
|
|
}
|
|
|
|
async fn setup_project(
|
|
example: &mut Example,
|
|
app_state: &Arc<EpAppState>,
|
|
step_progress: &StepProgress,
|
|
cx: &mut AsyncApp,
|
|
) -> Result<Entity<Project>> {
|
|
let ep_store = cx
|
|
.update(|cx| EditPredictionStore::try_global(cx))
|
|
.context("Store should be initialized at init")?;
|
|
|
|
let worktree_path = setup_worktree(example, step_progress).await?;
|
|
|
|
let project = cx.update(|cx| {
|
|
Project::local(
|
|
app_state.client.clone(),
|
|
app_state.node_runtime.clone(),
|
|
app_state.user_store.clone(),
|
|
app_state.languages.clone(),
|
|
app_state.fs.clone(),
|
|
None,
|
|
project::LocalProjectFlags {
|
|
init_worktree_trust: false,
|
|
watch_global_configs: false,
|
|
},
|
|
cx,
|
|
)
|
|
});
|
|
|
|
project
|
|
.update(cx, |project, cx| {
|
|
project.disable_worktree_scanner(cx);
|
|
project.create_worktree(&worktree_path, true, cx)
|
|
})
|
|
.await?;
|
|
|
|
let buffer_store = project.read_with(cx, |project, _| project.buffer_store().clone());
|
|
cx.subscribe(&buffer_store, {
|
|
let project = project.downgrade();
|
|
let ep_store = ep_store.downgrade();
|
|
move |_, event, cx| match event {
|
|
BufferStoreEvent::BufferAdded(buffer) => {
|
|
let Some(project) = project.upgrade() else {
|
|
return;
|
|
};
|
|
ep_store
|
|
.update(cx, |store, cx| store.register_buffer(&buffer, &project, cx))
|
|
.ok();
|
|
}
|
|
_ => {}
|
|
}
|
|
})
|
|
.detach();
|
|
|
|
Ok(project)
|
|
}
|
|
|
|
async fn setup_worktree(example: &Example, step_progress: &StepProgress) -> Result<PathBuf> {
|
|
let repo_name = example.repo_name().context("failed to get repo name")?;
|
|
let repo_dir = git::repo_path_for_url(&example.spec.repository_url)?;
|
|
let worktree_path = repo_name.worktree_path();
|
|
let repo_lock = git::lock_repo(&repo_dir).await;
|
|
|
|
// Clean up any stale git lock files from previous crashed runs.
|
|
// Safe-ish since we have our own lock.
|
|
// WARNING: Can corrupt worktrees if multiple processes of the CLI are running.
|
|
let worktree_git_dir = repo_dir
|
|
.join(".git/worktrees")
|
|
.join(repo_name.name.as_ref());
|
|
for lock_file in &["index.lock", "HEAD.lock", "config.lock"] {
|
|
let worktree_lock_path = worktree_git_dir.join(lock_file);
|
|
let repo_lock_path = repo_dir.join(".git").join(lock_file);
|
|
if worktree_lock_path.exists() {
|
|
fs::remove_file(&worktree_lock_path).ok();
|
|
}
|
|
if repo_lock_path.exists() {
|
|
fs::remove_file(&repo_lock_path).ok();
|
|
}
|
|
}
|
|
|
|
let mut git_repo_exists = false;
|
|
if repo_dir.is_dir() {
|
|
if git::run_git(&repo_dir, &["remote", "get-url", "origin"])
|
|
.await
|
|
.map_or(false, |origin| origin.trim() == example.spec.repository_url)
|
|
{
|
|
git_repo_exists = true;
|
|
} else {
|
|
fs::remove_dir_all(&repo_dir).ok();
|
|
}
|
|
}
|
|
|
|
if !git_repo_exists {
|
|
step_progress.set_substatus(format!("cloning {}", repo_name.name));
|
|
fs::create_dir_all(&repo_dir)?;
|
|
git::run_git(&repo_dir, &["init"]).await?;
|
|
git::run_git(
|
|
&repo_dir,
|
|
&["remote", "add", "origin", &example.spec.repository_url],
|
|
)
|
|
.await?;
|
|
}
|
|
|
|
// Resolve the example to a revision, fetching it if needed.
|
|
step_progress.set_substatus("fetching");
|
|
let revision = git::fetch_if_needed(&repo_dir, &example.spec.revision).await?;
|
|
|
|
// Clean up any stale worktree registrations from previous crashed runs.
|
|
git::run_git(&repo_dir, &["worktree", "prune"]).await.ok();
|
|
|
|
// Create the worktree for this example if needed.
|
|
step_progress.set_substatus("preparing worktree");
|
|
|
|
// Check if worktree exists and is valid (not just a directory from a crashed run).
|
|
let worktree_valid = worktree_path.is_dir()
|
|
&& git::run_git(&worktree_path, &["rev-parse", "--git-dir"])
|
|
.await
|
|
.is_ok();
|
|
|
|
if worktree_valid {
|
|
git::run_git(&worktree_path, &["clean", "--force", "-d"]).await?;
|
|
git::run_git(&worktree_path, &["reset", "--hard", "HEAD"]).await?;
|
|
git::run_git(&worktree_path, &["checkout", revision.as_str()]).await?;
|
|
} else {
|
|
let worktree_path_string = worktree_path.to_string_lossy();
|
|
|
|
// Clean up invalid worktree directory and registration if they exist.
|
|
if worktree_path.exists() {
|
|
fs::remove_dir_all(&worktree_path).ok();
|
|
}
|
|
git::run_git(
|
|
&repo_dir,
|
|
&["worktree", "remove", "--force", &worktree_path_string],
|
|
)
|
|
.await
|
|
.ok();
|
|
|
|
let branch_name = example.spec.filename();
|
|
git::run_git(
|
|
&repo_dir,
|
|
&["branch", "-f", &branch_name, revision.as_str()],
|
|
)
|
|
.await?;
|
|
git::run_git(
|
|
&repo_dir,
|
|
&["worktree", "add", "-f", &worktree_path_string, &branch_name],
|
|
)
|
|
.await?;
|
|
}
|
|
drop(repo_lock);
|
|
|
|
if !example.spec.uncommitted_diff.is_empty() {
|
|
step_progress.set_substatus("applying diff");
|
|
|
|
// old examples had full paths in the uncommitted diff.
|
|
let uncommitted_diff =
|
|
strip_diff_path_prefix(&example.spec.uncommitted_diff, &repo_name.name);
|
|
|
|
let mut apply_process = smol::process::Command::new("git")
|
|
.current_dir(&worktree_path)
|
|
.args(&["apply", "-"])
|
|
.stdin(std::process::Stdio::piped())
|
|
.spawn()?;
|
|
|
|
let mut stdin = apply_process.stdin.take().context("Failed to get stdin")?;
|
|
stdin.write_all(uncommitted_diff.as_bytes()).await?;
|
|
stdin.close().await?;
|
|
drop(stdin);
|
|
|
|
let apply_result = apply_process.output().await?;
|
|
anyhow::ensure!(
|
|
apply_result.status.success(),
|
|
"Failed to apply uncommitted diff patch with status: {}\nstderr:\n{}\nstdout:\n{}",
|
|
apply_result.status,
|
|
String::from_utf8_lossy(&apply_result.stderr),
|
|
String::from_utf8_lossy(&apply_result.stdout),
|
|
);
|
|
}
|
|
|
|
step_progress.clear_substatus();
|
|
Ok(worktree_path)
|
|
}
|
|
|
|
async fn apply_edit_history(
|
|
example: &Example,
|
|
project: &Entity<Project>,
|
|
cx: &mut AsyncApp,
|
|
) -> Result<OpenedBuffers> {
|
|
edit_prediction::udiff::apply_diff(&example.spec.edit_history, project, cx).await
|
|
}
|