Merge branch 'main' into ollama-inline-completions

This commit is contained in:
Oliver Azevedo Barnes 2025-08-20 18:41:08 -04:00
commit 548feed24f
No known key found for this signature in database
757 changed files with 24165 additions and 16916 deletions

View file

@ -174,7 +174,7 @@ impl Render for EditPredictionButton {
let account_status = agent.account_status.clone();
match account_status {
AccountStatus::NeedsActivation { activate_url } => {
SupermavenButtonStatus::NeedsActivation(activate_url.clone())
SupermavenButtonStatus::NeedsActivation(activate_url)
}
AccountStatus::Unknown => SupermavenButtonStatus::Initializing,
AccountStatus::Ready => SupermavenButtonStatus::Ready,
@ -191,7 +191,7 @@ impl Render for EditPredictionButton {
let this = cx.entity();
let fs = self.fs.clone();
return div().child(
div().child(
PopoverMenu::new("supermaven")
.menu(move |window, cx| match &status {
SupermavenButtonStatus::NeedsActivation(activate_url) => {
@ -236,7 +236,7 @@ impl Render for EditPredictionButton {
},
)
.with_handle(self.popover_menu_handle.clone()),
);
)
}
EditPredictionProvider::Zed => {
@ -349,7 +349,7 @@ impl Render for EditPredictionButton {
let is_refreshing = self
.edit_prediction_provider
.as_ref()
.map_or(false, |provider| provider.is_refreshing(cx));
.is_some_and(|provider| provider.is_refreshing(cx));
if is_refreshing {
popover_menu = popover_menu.trigger(