Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/icons/arrow_right_left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/cog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion crates/assistant2/src/active_thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1258,12 +1258,13 @@ impl ActiveThread {
"edit-files" => IconName::Pencil,
"fetch" => IconName::Globe,
"list-directory" => IconName::Folder,
"move-path" => IconName::ArrowRightLeft,
"now" => IconName::Info,
"path-search" => IconName::SearchCode,
"read-file" => IconName::Eye,
"regex-search" => IconName::Regex,
"thinking" => IconName::Brain,
_ => IconName::Terminal,
_ => IconName::Cog,
};

div().py_2().child(
Expand Down
2 changes: 1 addition & 1 deletion crates/assistant2/src/context_picker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl ContextPickerMode {

pub fn label(&self) -> &'static str {
match self {
Self::File => "File/Directory",
Self::File => "Files & Directories",
Self::Fetch => "Fetch",
Self::Thread => "Thread",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ mod tests {
format!("six.txt {}", separator!("dir/b")).as_str(),
format!("five.txt {}", separator!("dir/b")).as_str(),
format!("four.txt {}", separator!("dir/a")).as_str(),
"File/Directory",
"Files & Directories",
"Fetch"
]
);
Expand Down
2 changes: 1 addition & 1 deletion crates/assistant_tools/src/bash_tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl Tool for BashTool {

fn ui_text(&self, input: &serde_json::Value) -> String {
match serde_json::from_value::<BashToolInput>(input.clone()) {
Ok(input) => format!("`$ {}`", input.command),
Ok(input) => format!("`{}`", input.command),
Err(_) => "Run bash command".to_string(),
}
}
Expand Down
3 changes: 2 additions & 1 deletion crates/editor/src/code_context_menus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ impl CompletionsMenu {
.or_else(|| {
completion.icon_path.as_ref().map(|path| {
Icon::from_path(path)
.size(IconSize::Small)
.size(IconSize::XSmall)
.color(Color::Muted)
.into_any_element()
})
});
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/components/icon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ pub enum IconName {
ArrowDownFromLine,
ArrowLeft,
ArrowRight,
ArrowRightLeft,
ArrowUp,
ArrowUpFromLine,
ArrowUpRight,
Expand Down Expand Up @@ -170,6 +171,7 @@ pub enum IconName {
Circle,
Close,
Code,
Cog,
Command,
Context,
Control,
Expand Down
Loading