zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 10:29:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Detect indentation from GPT output

Browse Source
This commit is contained in:
Antonio Scandurra 2023-08-30 12:07:58 +02:00
parent c6f4390511
commit 5f6562c214
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,7 +712,7 @@ 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 indent_len; let mut indent_len;
let indent_text; let indent_text;
if let Some(base_indent) = base_indent { if let Some(base_indent) = base_indent {
indent_len = base_indent.len; indent_len = base_indent.len;
@ -725,30 +725,43 @@ impl AssistantPanel {
indent_text = ""; indent_text = "";
}; };
let mut autoindent = true; let mut first_line_len = 0;
let mut first_chunk = true; let mut first_line_non_whitespace_char_ix = None;
let mut first_line = true;
let mut new_text = String::new(); let mut new_text = String::new();
while let Some(chunk) = chunks.next().await { while let Some(chunk) = chunks.next().await {
let chunk = chunk?; let chunk = chunk?;
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'); let mut lines = chunk.split('\n');
if let Some(first_line) = lines.next() { if let Some(mut line) = lines.next() {
new_text.push_str(first_line); if first_line {
if first_line_non_whitespace_char_ix.is_none() {
if let Some(mut char_ix) =
line.find(|ch: char| !ch.is_whitespace())
{
line = &line[char_ix..];
char_ix += first_line_len;
first_line_non_whitespace_char_ix = Some(char_ix);
let first_line_indent = char_ix
.saturating_sub(selection_start.column as usize)
as usize;
new_text.push_str(&indent_text.repeat(first_line_indent));
indent_len = indent_len.saturating_sub(char_ix as u32);
}
}
first_line_len += line.len();
}
if first_line_non_whitespace_char_ix.is_some() {
new_text.push_str(line);
}
} }
for line in lines { for line in lines {
first_line = false;
new_text.push('\n'); new_text.push('\n');
if !line.is_empty() && autoindent { if !line.is_empty() {
new_text.push_str(&indent_text.repeat(indent_len as usize)); new_text.push_str(&indent_text.repeat(indent_len as usize));
} }
new_text.push_str(line); new_text.push_str(line);
@ -757,7 +770,6 @@ impl AssistantPanel {
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?;