
This changes the `/workflow` command so that instead of emitting edits in separate steps, the user is presented with a single tab, with an editable diff that they can apply to the buffer. Todo * Assistant panel * [x] Show a patch title and a list of changed files in a block decoration * [x] Don't store resolved patches as state on Context. Resolve on demand. * [ ] Better presentation of patches in the panel * [ ] Show a spinner while patch is streaming in * Patches * [x] Preserve leading whitespace in new text, auto-indent insertions * [x] Ensure patch title is very short, to fit better in tab * [x] Improve patch location resolution, prefer skipping whitespace over skipping `}` * [x] Ensure patch edits are auto-indented properly * [ ] Apply `Update` edits via a diff between the old and new text, to get fine-grained edits. * Proposed changes editor * [x] Show patch title in the tab * [x] Add a toolbar with an "Apply all" button * [x] Make `open excerpts` open the corresponding location in the base buffer (https://github.com/zed-industries/zed/pull/18591) * [x] Add an apply button above every hunk (https://github.com/zed-industries/zed/pull/18592) * [x] Expand all diff hunks by default (https://github.com/zed-industries/zed/pull/18598) * [x] Fix https://github.com/zed-industries/zed/issues/18589 * [x] Syntax highlighting doesn't work until the buffer is edited (https://github.com/zed-industries/zed/pull/18648) * [x] Disable LSP interaction in Proposed Changes editor (https://github.com/zed-industries/zed/pull/18945) * [x] No auto-indent? (https://github.com/zed-industries/zed/pull/18984) * Prompt * [ ] make sure old_text is unique Release Notes: - N/A --------- Co-authored-by: Marshall Bowers <elliott.codes@gmail.com> Co-authored-by: Antonio <antonio@zed.dev> Co-authored-by: Richard <richard@zed.dev> Co-authored-by: Marshall <marshall@zed.dev> Co-authored-by: Nate Butler <iamnbutler@gmail.com> Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>
746 lines
24 KiB
Rust
746 lines
24 KiB
Rust
use anyhow::{anyhow, Context as _, Result};
|
|
use collections::HashMap;
|
|
use editor::ProposedChangesEditor;
|
|
use futures::{future, TryFutureExt as _};
|
|
use gpui::{AppContext, AsyncAppContext, Model, SharedString};
|
|
use language::{AutoindentMode, Buffer, BufferSnapshot};
|
|
use project::{Project, ProjectPath};
|
|
use std::{cmp, ops::Range, path::Path, sync::Arc};
|
|
use text::{AnchorRangeExt as _, Bias, OffsetRangeExt as _, Point};
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub(crate) struct AssistantPatch {
|
|
pub range: Range<language::Anchor>,
|
|
pub title: SharedString,
|
|
pub edits: Arc<[Result<AssistantEdit>]>,
|
|
pub status: AssistantPatchStatus,
|
|
}
|
|
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
|
pub(crate) enum AssistantPatchStatus {
|
|
Pending,
|
|
Ready,
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub(crate) struct AssistantEdit {
|
|
pub path: String,
|
|
pub kind: AssistantEditKind,
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub enum AssistantEditKind {
|
|
Update {
|
|
old_text: String,
|
|
new_text: String,
|
|
description: String,
|
|
},
|
|
Create {
|
|
new_text: String,
|
|
description: String,
|
|
},
|
|
InsertBefore {
|
|
old_text: String,
|
|
new_text: String,
|
|
description: String,
|
|
},
|
|
InsertAfter {
|
|
old_text: String,
|
|
new_text: String,
|
|
description: String,
|
|
},
|
|
Delete {
|
|
old_text: String,
|
|
},
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub(crate) struct ResolvedPatch {
|
|
pub edit_groups: HashMap<Model<Buffer>, Vec<ResolvedEditGroup>>,
|
|
pub errors: Vec<AssistantPatchResolutionError>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub struct ResolvedEditGroup {
|
|
pub context_range: Range<language::Anchor>,
|
|
pub edits: Vec<ResolvedEdit>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub struct ResolvedEdit {
|
|
range: Range<language::Anchor>,
|
|
new_text: String,
|
|
description: Option<String>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub(crate) struct AssistantPatchResolutionError {
|
|
pub edit_ix: usize,
|
|
pub message: String,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
|
|
enum SearchDirection {
|
|
Up,
|
|
Left,
|
|
Diagonal,
|
|
}
|
|
|
|
// A measure of the currently quality of an in-progress fuzzy search.
|
|
//
|
|
// Uses 60 bits to store a numeric cost, and 4 bits to store the preceding
|
|
// operation in the search.
|
|
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
|
|
struct SearchState {
|
|
score: u32,
|
|
direction: SearchDirection,
|
|
}
|
|
|
|
impl SearchState {
|
|
fn new(score: u32, direction: SearchDirection) -> Self {
|
|
Self { score, direction }
|
|
}
|
|
}
|
|
|
|
impl ResolvedPatch {
|
|
pub fn apply(&self, editor: &ProposedChangesEditor, cx: &mut AppContext) {
|
|
for (buffer, groups) in &self.edit_groups {
|
|
let branch = editor.branch_buffer_for_base(buffer).unwrap();
|
|
Self::apply_edit_groups(groups, &branch, cx);
|
|
}
|
|
editor.recalculate_all_buffer_diffs();
|
|
}
|
|
|
|
fn apply_edit_groups(
|
|
groups: &Vec<ResolvedEditGroup>,
|
|
buffer: &Model<Buffer>,
|
|
cx: &mut AppContext,
|
|
) {
|
|
let mut edits = Vec::new();
|
|
for group in groups {
|
|
for suggestion in &group.edits {
|
|
edits.push((suggestion.range.clone(), suggestion.new_text.clone()));
|
|
}
|
|
}
|
|
buffer.update(cx, |buffer, cx| {
|
|
buffer.edit(
|
|
edits,
|
|
Some(AutoindentMode::Block {
|
|
original_indent_columns: Vec::new(),
|
|
}),
|
|
cx,
|
|
);
|
|
});
|
|
}
|
|
}
|
|
|
|
impl ResolvedEdit {
|
|
pub fn try_merge(&mut self, other: &Self, buffer: &text::BufferSnapshot) -> bool {
|
|
let range = &self.range;
|
|
let other_range = &other.range;
|
|
|
|
// Don't merge if we don't contain the other suggestion.
|
|
if range.start.cmp(&other_range.start, buffer).is_gt()
|
|
|| range.end.cmp(&other_range.end, buffer).is_lt()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if let Some(description) = &mut self.description {
|
|
if let Some(other_description) = &other.description {
|
|
description.push('\n');
|
|
description.push_str(other_description);
|
|
}
|
|
}
|
|
true
|
|
}
|
|
}
|
|
|
|
impl AssistantEdit {
|
|
pub fn new(
|
|
path: Option<String>,
|
|
operation: Option<String>,
|
|
old_text: Option<String>,
|
|
new_text: Option<String>,
|
|
description: Option<String>,
|
|
) -> Result<Self> {
|
|
let path = path.ok_or_else(|| anyhow!("missing path"))?;
|
|
let operation = operation.ok_or_else(|| anyhow!("missing operation"))?;
|
|
|
|
let kind = match operation.as_str() {
|
|
"update" => AssistantEditKind::Update {
|
|
old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
|
|
new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
|
|
description: description.ok_or_else(|| anyhow!("missing description"))?,
|
|
},
|
|
"insert_before" => AssistantEditKind::InsertBefore {
|
|
old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
|
|
new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
|
|
description: description.ok_or_else(|| anyhow!("missing description"))?,
|
|
},
|
|
"insert_after" => AssistantEditKind::InsertAfter {
|
|
old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
|
|
new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
|
|
description: description.ok_or_else(|| anyhow!("missing description"))?,
|
|
},
|
|
"delete" => AssistantEditKind::Delete {
|
|
old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
|
|
},
|
|
"create" => AssistantEditKind::Create {
|
|
description: description.ok_or_else(|| anyhow!("missing description"))?,
|
|
new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
|
|
},
|
|
_ => Err(anyhow!("unknown operation {operation:?}"))?,
|
|
};
|
|
|
|
Ok(Self { path, kind })
|
|
}
|
|
|
|
pub async fn resolve(
|
|
&self,
|
|
project: Model<Project>,
|
|
mut cx: AsyncAppContext,
|
|
) -> Result<(Model<Buffer>, ResolvedEdit)> {
|
|
let path = self.path.clone();
|
|
let kind = self.kind.clone();
|
|
let buffer = project
|
|
.update(&mut cx, |project, cx| {
|
|
let project_path = project
|
|
.find_project_path(Path::new(&path), cx)
|
|
.or_else(|| {
|
|
// If we couldn't find a project path for it, put it in the active worktree
|
|
// so that when we create the buffer, it can be saved.
|
|
let worktree = project
|
|
.active_entry()
|
|
.and_then(|entry_id| project.worktree_for_entry(entry_id, cx))
|
|
.or_else(|| project.worktrees(cx).next())?;
|
|
let worktree = worktree.read(cx);
|
|
|
|
Some(ProjectPath {
|
|
worktree_id: worktree.id(),
|
|
path: Arc::from(Path::new(&path)),
|
|
})
|
|
})
|
|
.with_context(|| format!("worktree not found for {:?}", path))?;
|
|
anyhow::Ok(project.open_buffer(project_path, cx))
|
|
})??
|
|
.await?;
|
|
|
|
let snapshot = buffer.update(&mut cx, |buffer, _| buffer.snapshot())?;
|
|
let suggestion = cx
|
|
.background_executor()
|
|
.spawn(async move { kind.resolve(&snapshot) })
|
|
.await;
|
|
|
|
Ok((buffer, suggestion))
|
|
}
|
|
}
|
|
|
|
impl AssistantEditKind {
|
|
fn resolve(self, snapshot: &BufferSnapshot) -> ResolvedEdit {
|
|
match self {
|
|
Self::Update {
|
|
old_text,
|
|
new_text,
|
|
description,
|
|
} => {
|
|
let range = Self::resolve_location(&snapshot, &old_text);
|
|
ResolvedEdit {
|
|
range,
|
|
new_text,
|
|
description: Some(description),
|
|
}
|
|
}
|
|
Self::Create {
|
|
new_text,
|
|
description,
|
|
} => ResolvedEdit {
|
|
range: text::Anchor::MIN..text::Anchor::MAX,
|
|
description: Some(description),
|
|
new_text,
|
|
},
|
|
Self::InsertBefore {
|
|
old_text,
|
|
mut new_text,
|
|
description,
|
|
} => {
|
|
let range = Self::resolve_location(&snapshot, &old_text);
|
|
new_text.push('\n');
|
|
ResolvedEdit {
|
|
range: range.start..range.start,
|
|
new_text,
|
|
description: Some(description),
|
|
}
|
|
}
|
|
Self::InsertAfter {
|
|
old_text,
|
|
mut new_text,
|
|
description,
|
|
} => {
|
|
let range = Self::resolve_location(&snapshot, &old_text);
|
|
new_text.insert(0, '\n');
|
|
ResolvedEdit {
|
|
range: range.end..range.end,
|
|
new_text,
|
|
description: Some(description),
|
|
}
|
|
}
|
|
Self::Delete { old_text } => {
|
|
let range = Self::resolve_location(&snapshot, &old_text);
|
|
ResolvedEdit {
|
|
range,
|
|
new_text: String::new(),
|
|
description: None,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn resolve_location(buffer: &text::BufferSnapshot, search_query: &str) -> Range<text::Anchor> {
|
|
const INSERTION_COST: u32 = 3;
|
|
const WHITESPACE_INSERTION_COST: u32 = 1;
|
|
const DELETION_COST: u32 = 3;
|
|
const WHITESPACE_DELETION_COST: u32 = 1;
|
|
const EQUALITY_BONUS: u32 = 5;
|
|
|
|
struct Matrix {
|
|
cols: usize,
|
|
data: Vec<SearchState>,
|
|
}
|
|
|
|
impl Matrix {
|
|
fn new(rows: usize, cols: usize) -> Self {
|
|
Matrix {
|
|
cols,
|
|
data: vec![SearchState::new(0, SearchDirection::Diagonal); rows * cols],
|
|
}
|
|
}
|
|
|
|
fn get(&self, row: usize, col: usize) -> SearchState {
|
|
self.data[row * self.cols + col]
|
|
}
|
|
|
|
fn set(&mut self, row: usize, col: usize, cost: SearchState) {
|
|
self.data[row * self.cols + col] = cost;
|
|
}
|
|
}
|
|
|
|
let buffer_len = buffer.len();
|
|
let query_len = search_query.len();
|
|
let mut matrix = Matrix::new(query_len + 1, buffer_len + 1);
|
|
|
|
for (row, query_byte) in search_query.bytes().enumerate() {
|
|
for (col, buffer_byte) in buffer.bytes_in_range(0..buffer.len()).flatten().enumerate() {
|
|
let deletion_cost = if query_byte.is_ascii_whitespace() {
|
|
WHITESPACE_DELETION_COST
|
|
} else {
|
|
DELETION_COST
|
|
};
|
|
let insertion_cost = if buffer_byte.is_ascii_whitespace() {
|
|
WHITESPACE_INSERTION_COST
|
|
} else {
|
|
INSERTION_COST
|
|
};
|
|
|
|
let up = SearchState::new(
|
|
matrix.get(row, col + 1).score.saturating_sub(deletion_cost),
|
|
SearchDirection::Up,
|
|
);
|
|
let left = SearchState::new(
|
|
matrix
|
|
.get(row + 1, col)
|
|
.score
|
|
.saturating_sub(insertion_cost),
|
|
SearchDirection::Left,
|
|
);
|
|
let diagonal = SearchState::new(
|
|
if query_byte == *buffer_byte {
|
|
matrix.get(row, col).score.saturating_add(EQUALITY_BONUS)
|
|
} else {
|
|
matrix
|
|
.get(row, col)
|
|
.score
|
|
.saturating_sub(deletion_cost + insertion_cost)
|
|
},
|
|
SearchDirection::Diagonal,
|
|
);
|
|
matrix.set(row + 1, col + 1, up.max(left).max(diagonal));
|
|
}
|
|
}
|
|
|
|
// Traceback to find the best match
|
|
let mut best_buffer_end = buffer_len;
|
|
let mut best_score = 0;
|
|
for col in 1..=buffer_len {
|
|
let score = matrix.get(query_len, col).score;
|
|
if score > best_score {
|
|
best_score = score;
|
|
best_buffer_end = col;
|
|
}
|
|
}
|
|
|
|
let mut query_ix = query_len;
|
|
let mut buffer_ix = best_buffer_end;
|
|
while query_ix > 0 && buffer_ix > 0 {
|
|
let current = matrix.get(query_ix, buffer_ix);
|
|
match current.direction {
|
|
SearchDirection::Diagonal => {
|
|
query_ix -= 1;
|
|
buffer_ix -= 1;
|
|
}
|
|
SearchDirection::Up => {
|
|
query_ix -= 1;
|
|
}
|
|
SearchDirection::Left => {
|
|
buffer_ix -= 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
let mut start = buffer.offset_to_point(buffer.clip_offset(buffer_ix, Bias::Left));
|
|
start.column = 0;
|
|
let mut end = buffer.offset_to_point(buffer.clip_offset(best_buffer_end, Bias::Right));
|
|
if end.column > 0 {
|
|
end.column = buffer.line_len(end.row);
|
|
}
|
|
|
|
buffer.anchor_after(start)..buffer.anchor_before(end)
|
|
}
|
|
}
|
|
|
|
impl AssistantPatch {
|
|
pub(crate) async fn resolve(
|
|
&self,
|
|
project: Model<Project>,
|
|
cx: &mut AsyncAppContext,
|
|
) -> ResolvedPatch {
|
|
let mut resolve_tasks = Vec::new();
|
|
for (ix, edit) in self.edits.iter().enumerate() {
|
|
if let Ok(edit) = edit.as_ref() {
|
|
resolve_tasks.push(
|
|
edit.resolve(project.clone(), cx.clone())
|
|
.map_err(move |error| (ix, error)),
|
|
);
|
|
}
|
|
}
|
|
|
|
let edits = future::join_all(resolve_tasks).await;
|
|
let mut errors = Vec::new();
|
|
let mut edits_by_buffer = HashMap::default();
|
|
for entry in edits {
|
|
match entry {
|
|
Ok((buffer, edit)) => {
|
|
edits_by_buffer
|
|
.entry(buffer)
|
|
.or_insert_with(Vec::new)
|
|
.push(edit);
|
|
}
|
|
Err((edit_ix, error)) => errors.push(AssistantPatchResolutionError {
|
|
edit_ix,
|
|
message: error.to_string(),
|
|
}),
|
|
}
|
|
}
|
|
|
|
// Expand the context ranges of each edit and group edits with overlapping context ranges.
|
|
let mut edit_groups_by_buffer = HashMap::default();
|
|
for (buffer, edits) in edits_by_buffer {
|
|
if let Ok(snapshot) = buffer.update(cx, |buffer, _| buffer.text_snapshot()) {
|
|
edit_groups_by_buffer.insert(buffer, Self::group_edits(edits, &snapshot));
|
|
}
|
|
}
|
|
|
|
ResolvedPatch {
|
|
edit_groups: edit_groups_by_buffer,
|
|
errors,
|
|
}
|
|
}
|
|
|
|
fn group_edits(
|
|
mut edits: Vec<ResolvedEdit>,
|
|
snapshot: &text::BufferSnapshot,
|
|
) -> Vec<ResolvedEditGroup> {
|
|
let mut edit_groups = Vec::<ResolvedEditGroup>::new();
|
|
// Sort edits by their range so that earlier, larger ranges come first
|
|
edits.sort_by(|a, b| a.range.cmp(&b.range, &snapshot));
|
|
|
|
// Merge overlapping edits
|
|
edits.dedup_by(|a, b| b.try_merge(a, &snapshot));
|
|
|
|
// Create context ranges for each edit
|
|
for edit in edits {
|
|
let context_range = {
|
|
let edit_point_range = edit.range.to_point(&snapshot);
|
|
let start_row = edit_point_range.start.row.saturating_sub(5);
|
|
let end_row = cmp::min(edit_point_range.end.row + 5, snapshot.max_point().row);
|
|
let start = snapshot.anchor_before(Point::new(start_row, 0));
|
|
let end = snapshot.anchor_after(Point::new(end_row, snapshot.line_len(end_row)));
|
|
start..end
|
|
};
|
|
|
|
if let Some(last_group) = edit_groups.last_mut() {
|
|
if last_group
|
|
.context_range
|
|
.end
|
|
.cmp(&context_range.start, &snapshot)
|
|
.is_ge()
|
|
{
|
|
// Merge with the previous group if context ranges overlap
|
|
last_group.context_range.end = context_range.end;
|
|
last_group.edits.push(edit);
|
|
} else {
|
|
// Create a new group
|
|
edit_groups.push(ResolvedEditGroup {
|
|
context_range,
|
|
edits: vec![edit],
|
|
});
|
|
}
|
|
} else {
|
|
// Create the first group
|
|
edit_groups.push(ResolvedEditGroup {
|
|
context_range,
|
|
edits: vec![edit],
|
|
});
|
|
}
|
|
}
|
|
|
|
edit_groups
|
|
}
|
|
|
|
pub fn path_count(&self) -> usize {
|
|
self.paths().count()
|
|
}
|
|
|
|
pub fn paths(&self) -> impl '_ + Iterator<Item = &str> {
|
|
let mut prev_path = None;
|
|
self.edits.iter().filter_map(move |edit| {
|
|
if let Ok(edit) = edit {
|
|
let path = Some(edit.path.as_str());
|
|
if path != prev_path {
|
|
prev_path = path;
|
|
return path;
|
|
}
|
|
}
|
|
None
|
|
})
|
|
}
|
|
}
|
|
|
|
impl PartialEq for AssistantPatch {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.range == other.range
|
|
&& self.title == other.title
|
|
&& Arc::ptr_eq(&self.edits, &other.edits)
|
|
}
|
|
}
|
|
|
|
impl Eq for AssistantPatch {}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use gpui::{AppContext, Context};
|
|
use language::{
|
|
language_settings::AllLanguageSettings, Language, LanguageConfig, LanguageMatcher,
|
|
};
|
|
use settings::SettingsStore;
|
|
use text::{OffsetRangeExt, Point};
|
|
use ui::BorrowAppContext;
|
|
use unindent::Unindent as _;
|
|
|
|
#[gpui::test]
|
|
fn test_resolve_location(cx: &mut AppContext) {
|
|
{
|
|
let buffer = cx.new_model(|cx| {
|
|
Buffer::local(
|
|
concat!(
|
|
" Lorem\n",
|
|
" ipsum\n",
|
|
" dolor sit amet\n",
|
|
" consecteur",
|
|
),
|
|
cx,
|
|
)
|
|
});
|
|
let snapshot = buffer.read(cx).snapshot();
|
|
assert_eq!(
|
|
AssistantEditKind::resolve_location(&snapshot, "ipsum\ndolor").to_point(&snapshot),
|
|
Point::new(1, 0)..Point::new(2, 18)
|
|
);
|
|
}
|
|
|
|
{
|
|
let buffer = cx.new_model(|cx| {
|
|
Buffer::local(
|
|
concat!(
|
|
"fn foo1(a: usize) -> usize {\n",
|
|
" 40\n",
|
|
"}\n",
|
|
"\n",
|
|
"fn foo2(b: usize) -> usize {\n",
|
|
" 42\n",
|
|
"}\n",
|
|
),
|
|
cx,
|
|
)
|
|
});
|
|
let snapshot = buffer.read(cx).snapshot();
|
|
assert_eq!(
|
|
AssistantEditKind::resolve_location(&snapshot, "fn foo1(b: usize) {\n40\n}")
|
|
.to_point(&snapshot),
|
|
Point::new(0, 0)..Point::new(2, 1)
|
|
);
|
|
}
|
|
|
|
{
|
|
let buffer = cx.new_model(|cx| {
|
|
Buffer::local(
|
|
concat!(
|
|
"fn main() {\n",
|
|
" Foo\n",
|
|
" .bar()\n",
|
|
" .baz()\n",
|
|
" .qux()\n",
|
|
"}\n",
|
|
"\n",
|
|
"fn foo2(b: usize) -> usize {\n",
|
|
" 42\n",
|
|
"}\n",
|
|
),
|
|
cx,
|
|
)
|
|
});
|
|
let snapshot = buffer.read(cx).snapshot();
|
|
assert_eq!(
|
|
AssistantEditKind::resolve_location(&snapshot, "Foo.bar.baz.qux()")
|
|
.to_point(&snapshot),
|
|
Point::new(1, 0)..Point::new(4, 14)
|
|
);
|
|
}
|
|
}
|
|
|
|
#[gpui::test]
|
|
fn test_resolve_edits(cx: &mut AppContext) {
|
|
let settings_store = SettingsStore::test(cx);
|
|
cx.set_global(settings_store);
|
|
language::init(cx);
|
|
cx.update_global::<SettingsStore, _>(|settings, cx| {
|
|
settings.update_user_settings::<AllLanguageSettings>(cx, |_| {});
|
|
});
|
|
|
|
assert_edits(
|
|
"
|
|
/// A person
|
|
struct Person {
|
|
name: String,
|
|
age: usize,
|
|
}
|
|
|
|
/// A dog
|
|
struct Dog {
|
|
weight: f32,
|
|
}
|
|
|
|
impl Person {
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
}
|
|
"
|
|
.unindent(),
|
|
vec![
|
|
AssistantEditKind::Update {
|
|
old_text: "
|
|
name: String,
|
|
"
|
|
.unindent(),
|
|
new_text: "
|
|
first_name: String,
|
|
last_name: String,
|
|
"
|
|
.unindent(),
|
|
description: "".into(),
|
|
},
|
|
AssistantEditKind::Update {
|
|
old_text: "
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
"
|
|
.unindent(),
|
|
new_text: "
|
|
fn name(&self) -> String {
|
|
format!(\"{} {}\", self.first_name, self.last_name)
|
|
}
|
|
"
|
|
.unindent(),
|
|
description: "".into(),
|
|
},
|
|
],
|
|
"
|
|
/// A person
|
|
struct Person {
|
|
first_name: String,
|
|
last_name: String,
|
|
age: usize,
|
|
}
|
|
|
|
/// A dog
|
|
struct Dog {
|
|
weight: f32,
|
|
}
|
|
|
|
impl Person {
|
|
fn name(&self) -> String {
|
|
format!(\"{} {}\", self.first_name, self.last_name)
|
|
}
|
|
}
|
|
"
|
|
.unindent(),
|
|
cx,
|
|
);
|
|
}
|
|
|
|
#[track_caller]
|
|
fn assert_edits(
|
|
old_text: String,
|
|
edits: Vec<AssistantEditKind>,
|
|
new_text: String,
|
|
cx: &mut AppContext,
|
|
) {
|
|
let buffer =
|
|
cx.new_model(|cx| Buffer::local(old_text, cx).with_language(Arc::new(rust_lang()), cx));
|
|
let snapshot = buffer.read(cx).snapshot();
|
|
let resolved_edits = edits
|
|
.into_iter()
|
|
.map(|kind| kind.resolve(&snapshot))
|
|
.collect();
|
|
let edit_groups = AssistantPatch::group_edits(resolved_edits, &snapshot);
|
|
ResolvedPatch::apply_edit_groups(&edit_groups, &buffer, cx);
|
|
let actual_new_text = buffer.read(cx).text();
|
|
pretty_assertions::assert_eq!(actual_new_text, new_text);
|
|
}
|
|
|
|
fn rust_lang() -> Language {
|
|
Language::new(
|
|
LanguageConfig {
|
|
name: "Rust".into(),
|
|
matcher: LanguageMatcher {
|
|
path_suffixes: vec!["rs".to_string()],
|
|
..Default::default()
|
|
},
|
|
..Default::default()
|
|
},
|
|
Some(language::tree_sitter_rust::LANGUAGE.into()),
|
|
)
|
|
.with_indents_query(
|
|
r#"
|
|
(call_expression) @indent
|
|
(field_expression) @indent
|
|
(_ "(" ")" @end) @indent
|
|
(_ "{" "}" @end) @indent
|
|
"#,
|
|
)
|
|
.unwrap()
|
|
}
|
|
}
|