9248458928
We weren't showing the keybinding in none of the places where the model selector was visible. Also, I took advantage of the opportunity to change the keybinding for two reasons: 1. `cmd-shift-m` caused conflict if on an editor (inline assistant case) 2. `cmd-opt-/` is the one Cursor uses; so consistency with something that might be already consolidated sounds like a low-hanging fruit | Editor Inline Assist | Terminal Inline Assist | Assistant Panel | |--------|--------|--------| | <img width="1336" alt="Screenshot 2025-01-10 at 11 01 24 AM" src="https://github.com/user-attachments/assets/0782f217-025f-4bc0-b2fa-64b3524c968b" /> | <img width="1336" alt="Screenshot 2025-01-10 at 11 01 29 AM" src="https://github.com/user-attachments/assets/d05a3b5c-33fd-4593-b1d8-aa9944de816a" /> | <img width="1336" alt="Screenshot 2025-01-10 at 11 01 33 AM" src="https://github.com/user-attachments/assets/8cb075e7-ccde-46f5-aa05-d20a9d42b286" /> | Release Notes: - N/A
87 lines
3.3 KiB
Rust
87 lines
3.3 KiB
Rust
use fs::Fs;
|
|
use gpui::{FocusHandle, View};
|
|
use language_model::LanguageModelRegistry;
|
|
use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
|
|
use settings::update_settings_file;
|
|
use std::sync::Arc;
|
|
use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};
|
|
|
|
use crate::{assistant_settings::AssistantSettings, ToggleModelSelector};
|
|
|
|
pub struct AssistantModelSelector {
|
|
selector: View<LanguageModelSelector>,
|
|
menu_handle: PopoverMenuHandle<LanguageModelSelector>,
|
|
focus_handle: FocusHandle,
|
|
}
|
|
|
|
impl AssistantModelSelector {
|
|
pub(crate) fn new(
|
|
fs: Arc<dyn Fs>,
|
|
menu_handle: PopoverMenuHandle<LanguageModelSelector>,
|
|
focus_handle: FocusHandle,
|
|
cx: &mut WindowContext,
|
|
) -> Self {
|
|
Self {
|
|
selector: cx.new_view(|cx| {
|
|
let fs = fs.clone();
|
|
LanguageModelSelector::new(
|
|
move |model, cx| {
|
|
update_settings_file::<AssistantSettings>(
|
|
fs.clone(),
|
|
cx,
|
|
move |settings, _cx| settings.set_model(model.clone()),
|
|
);
|
|
},
|
|
cx,
|
|
)
|
|
}),
|
|
menu_handle,
|
|
focus_handle,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Render for AssistantModelSelector {
|
|
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
|
|
let active_model = LanguageModelRegistry::read_global(cx).active_model();
|
|
let focus_handle = self.focus_handle.clone();
|
|
|
|
LanguageModelSelectorPopoverMenu::new(
|
|
self.selector.clone(),
|
|
ButtonLike::new("active-model")
|
|
.style(ButtonStyle::Subtle)
|
|
.child(
|
|
h_flex()
|
|
.gap_0p5()
|
|
.child(
|
|
div()
|
|
.overflow_x_hidden()
|
|
.flex_grow()
|
|
.whitespace_nowrap()
|
|
.child(match active_model {
|
|
Some(model) => h_flex()
|
|
.child(
|
|
Label::new(model.name().0)
|
|
.size(LabelSize::Small)
|
|
.color(Color::Muted),
|
|
)
|
|
.into_any_element(),
|
|
_ => Label::new("No model selected")
|
|
.size(LabelSize::Small)
|
|
.color(Color::Muted)
|
|
.into_any_element(),
|
|
}),
|
|
)
|
|
.child(
|
|
Icon::new(IconName::ChevronDown)
|
|
.color(Color::Muted)
|
|
.size(IconSize::XSmall),
|
|
),
|
|
)
|
|
.tooltip(move |cx| {
|
|
Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
|
|
}),
|
|
)
|
|
.with_handle(self.menu_handle.clone())
|
|
}
|
|
}
|