zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't auto-indent when the assistant starts responding with indentation

Browse Source
This commit is contained in:
Antonio Scandurra 2023-08-28 11:57:02 +02:00
parent 937aabfdfd
commit d804afcfa9
1 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
crates/ai/src/assistant.rs
View File

@ -472,48 +472,48 @@ impl AssistantPanel {
.text_for_range(range.start..range.end) .text_for_range(range.start..range.end)
.collect::<Rope>(); .collect::<Rope>();
let mut base_indentation: Option<language::IndentSize> = None;
let selection_start = range.start.to_point(&snapshot); let selection_start = range.start.to_point(&snapshot);
let selection_end = range.end.to_point(&snapshot); let selection_end = range.end.to_point(&snapshot);
let mut base_indent: Option<language::IndentSize> = None;
let mut start_row = selection_start.row; let mut start_row = selection_start.row;
if snapshot.is_line_blank(start_row) { if snapshot.is_line_blank(start_row) {
if let Some(prev_non_blank_row) = snapshot.prev_non_blank_row(start_row) { if let Some(prev_non_blank_row) = snapshot.prev_non_blank_row(start_row) {
start_row = prev_non_blank_row; start_row = prev_non_blank_row;
} }
} }
for row in start_row..=selection_end.row { for row in start_row..=selection_end.row {
if snapshot.is_line_blank(row) { if snapshot.is_line_blank(row) {
continue; continue;
} }
let line_indentation = snapshot.indent_size_for_line(row); let line_indent = snapshot.indent_size_for_line(row);
if let Some(base_indentation) = base_indentation.as_mut() { if let Some(base_indent) = base_indent.as_mut() {
if line_indentation.len < base_indentation.len { if line_indent.len < base_indent.len {
*base_indentation = line_indentation; *base_indent = line_indent;
} }
} else { } else {
base_indentation = Some(line_indentation); base_indent = Some(line_indent);
} }
} }
let mut normalized_selected_text = selected_text.clone(); let mut normalized_selected_text = selected_text.clone();
if let Some(base_indentation) = base_indentation { if let Some(base_indent) = base_indent {
for row in selection_start.row..=selection_end.row { for row in selection_start.row..=selection_end.row {
let selection_row = row - selection_start.row; let selection_row = row - selection_start.row;
let line_start = let line_start =
normalized_selected_text.point_to_offset(Point::new(selection_row, 0)); normalized_selected_text.point_to_offset(Point::new(selection_row, 0));
let indentation_len = if row == selection_start.row { let indent_len = if row == selection_start.row {
base_indentation.len.saturating_sub(selection_start.column) base_indent.len.saturating_sub(selection_start.column)
} else { } else {
let line_len = normalized_selected_text.line_len(selection_row); let line_len = normalized_selected_text.line_len(selection_row);
cmp::min(line_len, base_indentation.len) cmp::min(line_len, base_indent.len)
}; };
let indentation_end = cmp::min( let indent_end = cmp::min(
line_start + indentation_len as usize, line_start + indent_len as usize,
normalized_selected_text.len(), normalized_selected_text.len(),
); );
normalized_selected_text.replace(line_start..indentation_end, ""); normalized_selected_text.replace(line_start..indent_end, "");
} }
} }
@ -581,7 +581,11 @@ impl AssistantPanel {
"Assume the cursor is located where the `<|>` marker is." "Assume the cursor is located where the `<|>` marker is."
) )
.unwrap(); .unwrap();
writeln!(prompt, "Assume your answer will be inserted at the cursor.").unwrap(); writeln!(
prompt,
"Code can't be replaced, so assume your answer will be inserted at the cursor."
)
.unwrap();
writeln!( writeln!(
prompt, prompt,
"Complete the code given the user prompt: {user_prompt}" "Complete the code given the user prompt: {user_prompt}"
@ -591,7 +595,11 @@ impl AssistantPanel {
} }
writeln!(prompt, "Your answer MUST always be valid {language_name}.").unwrap(); writeln!(prompt, "Your answer MUST always be valid {language_name}.").unwrap();
writeln!(prompt, "Always wrap your response in a Markdown codeblock.").unwrap(); writeln!(prompt, "Always wrap your response in a Markdown codeblock.").unwrap();
writeln!(prompt, "Never make remarks, always output code.").unwrap(); writeln!(
prompt,
"Never make remarks about the output, always output just code."
)
.unwrap();
let request = OpenAIRequest { let request = OpenAIRequest {
model: model.full_name().into(), model: model.full_name().into(),
@ -626,40 +634,51 @@ impl AssistantPanel {
futures::pin_mut!(chunks); futures::pin_mut!(chunks);
let mut diff = StreamingDiff::new(selected_text.to_string()); let mut diff = StreamingDiff::new(selected_text.to_string());
let indentation_len; let indent_len;
let indentation_text; let indent_text;
if let Some(base_indentation) = base_indentation { if let Some(base_indent) = base_indent {
indentation_len = base_indentation.len; indent_len = base_indent.len;
indentation_text = match base_indentation.kind { indent_text = match base_indent.kind {
language::IndentKind::Space => " ", language::IndentKind::Space => " ",
language::IndentKind::Tab => "\t", language::IndentKind::Tab => "\t",
}; };
} else { } else {
indentation_len = 0; indent_len = 0;
indentation_text = ""; indent_text = "";
}; };
let mut new_text = indentation_text let mut autoindent = true;
.repeat(indentation_len.saturating_sub(selection_start.column) as usize); let mut first_chunk = true;
let mut new_text = String::new();
while let Some(message) = chunks.next().await { while let Some(chunk) = chunks.next().await {
let mut lines = message.split('\n'); if first_chunk && (chunk.starts_with(' ') || chunk.starts_with('\t')) {
autoindent = false;
}
if first_chunk && autoindent {
let first_line_indent =
indent_len.saturating_sub(selection_start.column) as usize;
new_text = indent_text.repeat(first_line_indent);
}
let mut lines = chunk.split('\n');
if let Some(first_line) = lines.next() { if let Some(first_line) = lines.next() {
new_text.push_str(first_line); new_text.push_str(first_line);
} }
for line in lines { for line in lines {
new_text.push('\n'); new_text.push('\n');
if !line.is_empty() { if !line.is_empty() && autoindent {
new_text new_text.push_str(&indent_text.repeat(indent_len as usize));
.push_str(&indentation_text.repeat(indentation_len as usize));
new_text.push_str(line);
} }
new_text.push_str(line);
} }
let hunks = diff.push_new(&new_text); let hunks = diff.push_new(&new_text);
hunks_tx.send(hunks).await?; hunks_tx.send(hunks).await?;
new_text.clear(); new_text.clear();
first_chunk = false;
} }
hunks_tx.send(diff.finish()).await?; hunks_tx.send(diff.finish()).await?;