Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant: Improve UI feedback when inserting /delta without new changes (#20356)

Browse source 
Closes https://github.com/zed-industries/zed/issues/18488

### Before

No feedback when inserting `/delta` without new changes.


https://github.com/user-attachments/assets/4cc76ff4-419d-4a3f-a6a2-8712856b1aa8

### After

You now see an error within the `delta` crease.


https://github.com/user-attachments/assets/c56654bb-776f-4dac-a499-db4625a4f1bd

Release Notes:

- Improve UI feedback when inserting `/delta` without new changes
This commit is contained in:
Danilo Leal 2024-11-07 10:56:01 -03:00 • committed by GitHub
parent 083f06322d
commit 37366ac907
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/assistant/src/slash_command/delta_command.rs
View file

@ -58,6 +58,7 @@ impl SlashCommand for DeltaSlashCommand {
let mut paths = HashSet::default(); let mut paths = HashSet::default();
let mut file_command_old_outputs = Vec::new(); let mut file_command_old_outputs = Vec::new();
let mut file_command_new_outputs = Vec::new(); let mut file_command_new_outputs = Vec::new();
for section in context_slash_command_output_sections.iter().rev() { for section in context_slash_command_output_sections.iter().rev() {
if let Some(metadata) = section if let Some(metadata) = section
.metadata .metadata
@ -84,6 +85,7 @@ impl SlashCommand for DeltaSlashCommand {
cx.background_executor().spawn(async move { cx.background_executor().spawn(async move {
let mut output = SlashCommandOutput::default(); let mut output = SlashCommandOutput::default();
let mut changes_detected = false;
let file_command_new_outputs = future::join_all(file_command_new_outputs).await; let file_command_new_outputs = future::join_all(file_command_new_outputs).await;
for (old_text, new_output) in file_command_old_outputs for (old_text, new_output) in file_command_old_outputs
@ -96,6 +98,7 @@ impl SlashCommand for DeltaSlashCommand {
if let Some(file_command_range) = new_output.sections.first() { if let Some(file_command_range) = new_output.sections.first() {
let new_text = &new_output.text[file_command_range.range.clone()]; let new_text = &new_output.text[file_command_range.range.clone()];
if old_text.chars().ne(new_text.chars()) { if old_text.chars().ne(new_text.chars()) {
changes_detected = true;
output.sections.extend(new_output.sections.into_iter().map( output.sections.extend(new_output.sections.into_iter().map(
|section| SlashCommandOutputSection { |section| SlashCommandOutputSection {
range: output.text.len() + section.range.start range: output.text.len() + section.range.start
@ -112,6 +115,10 @@ impl SlashCommand for DeltaSlashCommand {
} }
} }
if !changes_detected {
return Err(anyhow!("no new changes detected"));
}
Ok(output.to_event_stream()) Ok(output.to_event_stream())
}) })
} }