Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Classify edit prediction lifecycle triggers (#60983)

Ben Kunkleeb0e870042f3
diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index adbcffe9be8..167507e86a3 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -131,6 +131,11 @@ pub enum PredictEditsRequestTrigger {
LSPCompletionAccepted,
PredictionAccepted,
PredictionPartiallyAccepted,
+ EditorCreated,
+ ProviderChanged,
+ UserInfoChanged,
+ VimModeChanged,
+ SettingsChanged,
#[default]
Other,
}
diff --git a/crates/copilot/src/copilot_edit_prediction_delegate.rs b/crates/copilot/src/copilot_edit_prediction_delegate.rs
index d295d94198f..85446c47928 100644
--- a/crates/copilot/src/copilot_edit_prediction_delegate.rs
+++ b/crates/copilot/src/copilot_edit_prediction_delegate.rs
@@ -283,7 +283,12 @@ mod tests {
.await;
let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+ editor.set_edit_prediction_provider(
+ Some(copilot_provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ )
});
cx.set_state(indoc! {"
@@ -491,7 +496,12 @@ mod tests {
.await;
let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+ editor.set_edit_prediction_provider(
+ Some(copilot_provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ )
});
// Setup the editor with a completion request.
@@ -623,7 +633,12 @@ mod tests {
.await;
let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+ editor.set_edit_prediction_provider(
+ Some(copilot_provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ )
});
cx.set_state(indoc! {"
@@ -718,7 +733,12 @@ mod tests {
});
let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
editor.update_in(cx, |editor, window, cx| {
- editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+ editor.set_edit_prediction_provider(
+ Some(copilot_provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ )
});
handle_copilot_completion_request(
@@ -848,7 +868,12 @@ mod tests {
.await;
let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+ editor.set_edit_prediction_provider(
+ Some(copilot_provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ )
});
cx.set_state(indoc! {"
@@ -1014,7 +1039,12 @@ mod tests {
let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
editor
.update(cx, |editor, window, cx| {
- editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+ editor.set_edit_prediction_provider(
+ Some(copilot_provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ )
})
.unwrap();
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index cef4a63e33c..965d8bc2699 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -929,6 +929,17 @@ fn predict_edits_request_trigger_from_editor_trigger(
EditPredictionRequestTrigger::PredictionPartiallyAccepted => {
PredictEditsRequestTrigger::PredictionPartiallyAccepted
}
+ EditPredictionRequestTrigger::EditorCreated => PredictEditsRequestTrigger::EditorCreated,
+ EditPredictionRequestTrigger::ProviderChanged => {
+ PredictEditsRequestTrigger::ProviderChanged
+ }
+ EditPredictionRequestTrigger::UserInfoChanged => {
+ PredictEditsRequestTrigger::UserInfoChanged
+ }
+ EditPredictionRequestTrigger::VimModeChanged => PredictEditsRequestTrigger::VimModeChanged,
+ EditPredictionRequestTrigger::SettingsChanged => {
+ PredictEditsRequestTrigger::SettingsChanged
+ }
EditPredictionRequestTrigger::Other => PredictEditsRequestTrigger::Other,
}
}
diff --git a/crates/edit_prediction_types/src/edit_prediction_types.rs b/crates/edit_prediction_types/src/edit_prediction_types.rs
index bcd1f5d8e62..0a8f3de7dd9 100644
--- a/crates/edit_prediction_types/src/edit_prediction_types.rs
+++ b/crates/edit_prediction_types/src/edit_prediction_types.rs
@@ -17,6 +17,11 @@ pub enum EditPredictionRequestTrigger {
LSPCompletionAccepted,
PredictionAccepted,
PredictionPartiallyAccepted,
+ EditorCreated,
+ ProviderChanged,
+ UserInfoChanged,
+ VimModeChanged,
+ SettingsChanged,
#[default]
Other,
}
diff --git a/crates/edit_prediction_ui/src/rate_prediction_modal.rs b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
index e9d36860852..23607042c7b 100644
--- a/crates/edit_prediction_ui/src/rate_prediction_modal.rs
+++ b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
@@ -1249,6 +1249,19 @@ impl RatePredictionsModal {
PredictEditsRequestTrigger::PredictionPartiallyAccepted => {
(IconName::CheckDouble, "Prediction Partially Accepted")
}
+ PredictEditsRequestTrigger::EditorCreated => (IconName::File, "Editor Created"),
+ PredictEditsRequestTrigger::ProviderChanged => {
+ (IconName::Settings, "Provider Changed")
+ }
+ PredictEditsRequestTrigger::UserInfoChanged => {
+ (IconName::Person, "User Info Changed")
+ }
+ PredictEditsRequestTrigger::VimModeChanged => {
+ (IconName::Keyboard, "Vim Mode Changed")
+ }
+ PredictEditsRequestTrigger::SettingsChanged => {
+ (IconName::Settings, "Settings Changed")
+ }
PredictEditsRequestTrigger::Other => (IconName::CircleHelp, "Other"),
};
diff --git a/crates/editor/src/edit_prediction.rs b/crates/editor/src/edit_prediction.rs
index dd57f5cb1d6..88db5a8c923 100644
--- a/crates/editor/src/edit_prediction.rs
+++ b/crates/editor/src/edit_prediction.rs
@@ -152,6 +152,7 @@ impl Editor {
pub fn set_edit_prediction_provider<T>(
&mut self,
provider: Option<Entity<T>>,
+ trigger: EditPredictionRequestTrigger,
window: &mut Window,
cx: &mut Context<Self>,
) where
@@ -166,13 +167,7 @@ impl Editor {
provider: Arc::new(provider),
});
self.update_edit_prediction_settings(cx);
- self.refresh_edit_prediction(
- false,
- false,
- EditPredictionRequestTrigger::Other,
- window,
- cx,
- );
+ self.refresh_edit_prediction(false, false, trigger, window, cx);
}
pub fn set_edit_predictions_hidden_for_vim_mode(
@@ -189,7 +184,7 @@ impl Editor {
self.refresh_edit_prediction(
true,
false,
- EditPredictionRequestTrigger::Other,
+ EditPredictionRequestTrigger::VimModeChanged,
window,
cx,
);
diff --git a/crates/editor/src/edit_prediction_tests.rs b/crates/editor/src/edit_prediction_tests.rs
index 24ac960b916..21922ce7ae1 100644
--- a/crates/editor/src/edit_prediction_tests.rs
+++ b/crates/editor/src/edit_prediction_tests.rs
@@ -773,7 +773,12 @@ async fn test_edit_prediction_preview_does_not_hide_code_actions_on_modifier_pre
let provider = cx.new(|_| FakeEditPredictionDelegate::default());
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(provider.clone()), window, cx);
+ editor.set_edit_prediction_provider(
+ Some(provider.clone()),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ );
});
let snapshot = cx.buffer_snapshot();
@@ -1634,7 +1639,12 @@ fn assign_editor_completion_provider(
cx: &mut EditorTestContext,
) {
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(provider), window, cx);
+ editor.set_edit_prediction_provider(
+ Some(provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ );
})
}
@@ -1672,7 +1682,12 @@ fn assign_editor_completion_provider_non_zed(
cx: &mut EditorTestContext,
) {
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(provider), window, cx);
+ editor.set_edit_prediction_provider(
+ Some(provider),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ );
})
}
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a09b4096e16..0e2e4d635b4 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9770,7 +9770,13 @@ impl Editor {
}
self.refresh_runnables(None, window, cx);
self.update_edit_prediction_settings(cx);
- self.refresh_edit_prediction(true, false, EditPredictionRequestTrigger::Other, window, cx);
+ self.refresh_edit_prediction(
+ true,
+ false,
+ EditPredictionRequestTrigger::SettingsChanged,
+ window,
+ cx,
+ );
self.refresh_inline_values(cx);
let old_cursor_shape = self.cursor_shape;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 8e933079c72..b90054064ae 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -11559,7 +11559,12 @@ async fn test_undo_edit_prediction_scrolls_to_edit_pos(cx: &mut TestAppContext)
let provider = cx.new(|_| FakeEditPredictionDelegate::default());
cx.update_editor(|editor, window, cx| {
- editor.set_edit_prediction_provider(Some(provider.clone()), window, cx);
+ editor.set_edit_prediction_provider(
+ Some(provider.clone()),
+ EditPredictionRequestTrigger::EditorCreated,
+ window,
+ cx,
+ );
});
cx.set_state(indoc! {"
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index f0968bf9efe..616063431b6 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -3,7 +3,7 @@ use codestral::{CodestralEditPredictionDelegate, load_codestral_api_key};
use collections::HashMap;
use copilot::CopilotEditPredictionDelegate;
use edit_prediction::{EditPredictionModel, ZedEditPredictionDelegate};
-use editor::Editor;
+use editor::{EditPredictionRequestTrigger, Editor};
use gpui::{AnyWindowHandle, App, AppContext as _, Context, Entity, WeakEntity};
use language::{
ZetaVersion,
@@ -52,6 +52,7 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
assign_edit_prediction_provider(
editor,
provider_config,
+ EditPredictionRequestTrigger::EditorCreated,
&client,
user_store.clone(),
window,
@@ -74,6 +75,7 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
assign_edit_prediction_providers(
&editors,
provider_config,
+ EditPredictionRequestTrigger::UserInfoChanged,
&client,
user_store,
cx,
@@ -100,6 +102,7 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
assign_edit_prediction_providers(
&editors,
new_provider_config,
+ EditPredictionRequestTrigger::ProviderChanged,
&client,
user_store.clone(),
cx,
@@ -201,6 +204,7 @@ fn clear_edit_prediction_store_edit_history(_: &edit_prediction::ClearHistory, c
fn assign_edit_prediction_providers(
editors: &Rc<RefCell<HashMap<WeakEntity<Editor>, AnyWindowHandle>>>,
provider_config: Option<EditPredictionProviderConfig>,
+ trigger: EditPredictionRequestTrigger,
client: &Arc<Client>,
user_store: Entity<UserStore>,
cx: &mut App,
@@ -214,6 +218,7 @@ fn assign_edit_prediction_providers(
assign_edit_prediction_provider(
editor,
provider_config,
+ trigger,
client,
user_store.clone(),
window,
@@ -240,6 +245,7 @@ fn register_backward_compatible_actions(editor: &mut Editor, cx: &mut Context<Ed
fn assign_edit_prediction_provider(
editor: &mut Editor,
provider_config: Option<EditPredictionProviderConfig>,
+ trigger: EditPredictionRequestTrigger,
client: &Arc<Client>,
user_store: Entity<UserStore>,
window: &mut Window,
@@ -250,7 +256,9 @@ fn assign_edit_prediction_provider(
match provider_config {
None => {
- editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(None, window, cx);
+ editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(
+ None, trigger, window, cx,
+ );
}
Some(EditPredictionProviderConfig::Copilot) => {
let ep_store = edit_prediction::EditPredictionStore::global(client, &user_store, cx);
@@ -267,13 +275,13 @@ fn assign_edit_prediction_provider(
});
}
let provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
- editor.set_edit_prediction_provider(Some(provider), window, cx);
+ editor.set_edit_prediction_provider(Some(provider), trigger, window, cx);
}
}
Some(EditPredictionProviderConfig::Codestral) => {
let http_client = client.http_client();
let provider = cx.new(|_| CodestralEditPredictionDelegate::new(http_client));
- editor.set_edit_prediction_provider(Some(provider), window, cx);
+ editor.set_edit_prediction_provider(Some(provider), trigger, window, cx);
}
Some(EditPredictionProviderConfig::Zed(model)) => {
let ep_store = edit_prediction::EditPredictionStore::global(client, &user_store, cx);
@@ -283,7 +291,7 @@ fn assign_edit_prediction_provider(
{
if !organization_configuration.edit_prediction.is_enabled {
editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(
- None, window, cx,
+ None, trigger, window, cx,
);
return;
@@ -307,7 +315,7 @@ fn assign_edit_prediction_provider(
cx,
)
});
- editor.set_edit_prediction_provider(Some(provider), window, cx);
+ editor.set_edit_prediction_provider(Some(provider), trigger, window, cx);
}
}
}