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

Merge branch 'main' into ollama-inline-completions

Browse source 
# Conflicts:
#	crates/zed/src/zed/edit_prediction_registry.rs
This commit is contained in:
Oliver Azevedo Barnes 2025-08-08 20:50:03 +01:00
commit fbaa69f59b
No known key found for this signature in database
292 changed files with 656 additions and 838 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/language_models/src/provider/cloud.rs
View file

@ -437,7 +437,7 @@ fn render_accept_terms(
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_color(Color::Muted)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.when(thread_empty_state, |this| this.label_size(LabelSize::Small))
.on_click(move |_, _window, cx| cx.open_url("https://zed.dev/terms-of-service"));

8
crates/language_models/src/provider/lmstudio.rs
View file

@ -690,7 +690,7 @@ impl Render for ConfigurationView {
Button::new("lmstudio-site", "LM Studio")
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _window, cx| {
cx.open_url(LMSTUDIO_SITE)
@ -705,7 +705,7 @@ impl Render for ConfigurationView {
)
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _window, cx| {
cx.open_url(LMSTUDIO_DOWNLOAD_URL)
@ -718,7 +718,7 @@ impl Render for ConfigurationView {
Button::new("view-models", "Model Catalog")
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _window, cx| {
cx.open_url(LMSTUDIO_CATALOG_URL)
@ -744,7 +744,7 @@ impl Render for ConfigurationView {
Button::new("retry_lmstudio_models", "Connect")
.icon_position(IconPosition::Start)
.icon_size(IconSize::XSmall)
.icon(IconName::PlayOutlined)
.icon(IconName::PlayFilled)
.on_click(cx.listener(move |this, _, _window, cx| {
this.retry_connection(cx)
})),

8
crates/language_models/src/provider/ollama.rs
View file

@ -631,7 +631,7 @@ impl Render for ConfigurationView {
Button::new("ollama-site", "Ollama")
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _, cx| cx.open_url(OLLAMA_SITE))
.into_any_element(),
@ -644,7 +644,7 @@ impl Render for ConfigurationView {
)
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _, cx| {
cx.open_url(OLLAMA_DOWNLOAD_URL)
@ -657,7 +657,7 @@ impl Render for ConfigurationView {
Button::new("view-models", "View All Models")
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _, cx| cx.open_url(OLLAMA_LIBRARY_URL)),
),
@ -681,7 +681,7 @@ impl Render for ConfigurationView {
Button::new("retry_ollama_models", "Connect")
.icon_position(IconPosition::Start)
.icon_size(IconSize::XSmall)
.icon(IconName::PlayOutlined)
.icon(IconName::PlayFilled)
.on_click(cx.listener(move |this, _, _, cx| {
this.retry_connection(cx)
})),

2
crates/language_models/src/provider/open_ai.rs
View file

@ -869,7 +869,7 @@ impl Render for ConfigurationView {
.child(
Button::new("docs", "Learn More")
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _window, cx| {
cx.open_url("https://zed.dev/docs/ai/llm-providers#openai-api-compatible")

2
crates/language_models/src/ui/instruction_list_item.rs
View file

@ -47,7 +47,7 @@ impl IntoElement for InstructionListItem {
Button::new(unique_id, button_label)
.style(ButtonStyle::Subtle)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _window, cx| cx.open_url(&link)),
)