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

Display default prompts more elaborately (#16471)

Browse source 
Show them under `User` role instead of a `System` one, and insert them
expanded.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-08-19 18:44:52 +03:00 • committed by GitHub
parent bac8e81e73
commit 69aae2037d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/assistant/src/assistant_panel.rs
View file

@ -1808,7 +1808,7 @@ impl ContextEditor {
};
this.update_message_headers(cx);
this.update_image_blocks(cx);
this.insert_slash_command_output_sections(sections, cx);
this.insert_slash_command_output_sections(sections, false, cx);
this
}
@ -1821,7 +1821,7 @@ impl ContextEditor {
let command = self.context.update(cx, |context, cx| {
let first_message_id = context.messages(cx).next().unwrap().id;
context.update_metadata(first_message_id, cx, |metadata| {
metadata.role = Role::System;
metadata.role = Role::User;
});
context.reparse_slash_commands(cx);
context.pending_slash_commands()[0].clone()
@ -1832,6 +1832,7 @@ impl ContextEditor {
&command.name,
&command.arguments,
false,
true,
self.workspace.clone(),
cx,
);
@ -2098,6 +2099,7 @@ impl ContextEditor {
&command.name,
&command.arguments,
true,
false,
workspace.clone(),
cx,
);
@ -2106,19 +2108,27 @@ impl ContextEditor {
}
}
#[allow(clippy::too_many_arguments)]
pub fn run_command(
&mut self,
command_range: Range<language::Anchor>,
name: &str,
arguments: &[String],
ensure_trailing_newline: bool,
expand_result: bool,
workspace: WeakView<Workspace>,
cx: &mut ViewContext<Self>,
) {
if let Some(command) = SlashCommandRegistry::global(cx).command(name) {
let output = command.run(arguments, workspace, self.lsp_adapter_delegate.clone(), cx);
self.context.update(cx, |context, cx| {
context.insert_command_output(command_range, output, ensure_trailing_newline, cx)
context.insert_command_output(
command_range,
output,
ensure_trailing_newline,
expand_result,
cx,
)
});
}
}
@ -2204,6 +2214,7 @@ impl ContextEditor {
&command.name,
&command.arguments,
false,
false,
workspace.clone(),
cx,
);
@ -2300,8 +2311,13 @@ impl ContextEditor {
output_range,
sections,
run_commands_in_output,
expand_result,
} => {
self.insert_slash_command_output_sections(sections.iter().cloned(), cx);
self.insert_slash_command_output_sections(
sections.iter().cloned(),
*expand_result,
cx,
);
if *run_commands_in_output {
let commands = self.context.update(cx, |context, cx| {
@ -2317,6 +2333,7 @@ impl ContextEditor {
&command.name,
&command.arguments,
false,
false,
self.workspace.clone(),
cx,
);
@ -2333,6 +2350,7 @@ impl ContextEditor {
fn insert_slash_command_output_sections(
&mut self,
sections: impl IntoIterator<Item = SlashCommandOutputSection<language::Anchor>>,
expand_result: bool,
cx: &mut ViewContext<Self>,
) {
self.editor.update(cx, |editor, cx| {
@ -2387,6 +2405,9 @@ impl ContextEditor {
editor.insert_creases(creases, cx);
if expand_result {
buffer_rows_to_fold.clear();
}
for buffer_row in buffer_rows_to_fold.into_iter().rev() {
editor.fold_at(&FoldAt { buffer_row }, cx);
}