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

More polish

Browse source
This commit is contained in:
Antonio Scandurra 2023-08-29 14:41:02 +02:00
parent 08df24412a
commit 2332f82442
2 changed files with 41 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

61
crates/ai/src/assistant.rs
View file

@ -567,24 +567,37 @@ impl AssistantPanel {
} }
} }
let language_name = snapshot let language = snapshot.language_at(range.start);
.language_at(range.start) let language_name = if let Some(language) = language.as_ref() {
.map(|language| language.name()); if Arc::ptr_eq(language, &language::PLAIN_TEXT) {
let language_name = language_name.as_deref().unwrap_or(""); None
} else {
Some(language.name())
}
} else {
None
};
let language_name = language_name.as_deref();
let model = settings::get::<AssistantSettings>(cx) let model = settings::get::<AssistantSettings>(cx)
.default_open_ai_model .default_open_ai_model
.clone(); .clone();
let mut prompt = String::new(); let mut prompt = String::new();
writeln!(prompt, "You're an expert {language_name} engineer.").unwrap(); if let Some(language_name) = language_name {
writeln!(prompt, "You're an expert {language_name} engineer.").unwrap();
}
match pending_assist.kind { match pending_assist.kind {
InlineAssistKind::Transform => { InlineAssistKind::Transform => {
writeln!( writeln!(
prompt, prompt,
"You're currently working inside an editor on this code:" "You're currently working inside an editor on this file:"
) )
.unwrap(); .unwrap();
writeln!(prompt, "```{language_name}").unwrap(); if let Some(language_name) = language_name {
writeln!(prompt, "```{language_name}").unwrap();
} else {
writeln!(prompt, "```").unwrap();
}
for chunk in snapshot.text_for_range(Anchor::min()..Anchor::max()) { for chunk in snapshot.text_for_range(Anchor::min()..Anchor::max()) {
write!(prompt, "{chunk}").unwrap(); write!(prompt, "{chunk}").unwrap();
} }
@ -592,31 +605,39 @@ impl AssistantPanel {
writeln!( writeln!(
prompt, prompt,
"In particular, the user has selected the following code:" "In particular, the user has selected the following text:"
) )
.unwrap(); .unwrap();
writeln!(prompt, "```{language_name}").unwrap(); if let Some(language_name) = language_name {
writeln!(prompt, "```{language_name}").unwrap();
} else {
writeln!(prompt, "```").unwrap();
}
writeln!(prompt, "{normalized_selected_text}").unwrap(); writeln!(prompt, "{normalized_selected_text}").unwrap();
writeln!(prompt, "```").unwrap(); writeln!(prompt, "```").unwrap();
writeln!(prompt).unwrap(); writeln!(prompt).unwrap();
writeln!( writeln!(
prompt, prompt,
"Modify the selected code given the user prompt: {user_prompt}" "Modify the selected text given the user prompt: {user_prompt}"
) )
.unwrap(); .unwrap();
writeln!( writeln!(
prompt, prompt,
"You MUST reply only with the edited selected code, not the entire file." "You MUST reply only with the edited selected text, not the entire file."
) )
.unwrap(); .unwrap();
} }
InlineAssistKind::Generate => { InlineAssistKind::Generate => {
writeln!( writeln!(
prompt, prompt,
"You're currently working inside an editor on this code:" "You're currently working inside an editor on this file:"
) )
.unwrap(); .unwrap();
writeln!(prompt, "```{language_name}").unwrap(); if let Some(language_name) = language_name {
writeln!(prompt, "```{language_name}").unwrap();
} else {
writeln!(prompt, "```").unwrap();
}
for chunk in snapshot.text_for_range(Anchor::min()..range.start) { for chunk in snapshot.text_for_range(Anchor::min()..range.start) {
write!(prompt, "{chunk}").unwrap(); write!(prompt, "{chunk}").unwrap();
} }
@ -633,23 +654,21 @@ impl AssistantPanel {
.unwrap(); .unwrap();
writeln!( writeln!(
prompt, prompt,
"Code can't be replaced, so assume your answer will be inserted at the cursor." "Text can't be replaced, so assume your answer will be inserted at the cursor."
) )
.unwrap(); .unwrap();
writeln!( writeln!(
prompt, prompt,
"Complete the code given the user prompt: {user_prompt}" "Complete the text given the user prompt: {user_prompt}"
) )
.unwrap(); .unwrap();
} }
} }
writeln!(prompt, "Your answer MUST always be valid {language_name}.").unwrap(); if let Some(language_name) = language_name {
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!( writeln!(prompt, "Never make remarks about the output.").unwrap();
prompt,
"Never make remarks about the output, always output just code."
)
.unwrap();
let mut request = OpenAIRequest { let mut request = OpenAIRequest {
model: model.full_name().into(), model: model.full_name().into(),

1
styles/src/style_tree/assistant.ts
View file

@ -60,6 +60,7 @@ export default function assistant(): any {
padding: { left: 12 }, padding: { left: 12 },
}, },
inline: { inline: {
background: background(theme.highest),
margin: { top: 3, bottom: 3 }, margin: { top: 3, bottom: 3 },
border: border(theme.lowest, "on", { border: border(theme.lowest, "on", {
top: true, top: true,