Release Notes: - N/A --------- Co-authored-by: Agus Zubiaga <agus@zed.dev>
264 lines
7.9 KiB
Rust
264 lines
7.9 KiB
Rust
use std::{
|
|
cmp,
|
|
sync::Arc,
|
|
time::{Duration, Instant},
|
|
};
|
|
|
|
use arrayvec::ArrayVec;
|
|
use client::{Client, UserStore};
|
|
use edit_prediction::{DataCollectionState, Direction, EditPredictionProvider};
|
|
use gpui::{App, Entity, Task, prelude::*};
|
|
use language::ToPoint as _;
|
|
use project::Project;
|
|
use util::ResultExt as _;
|
|
|
|
use crate::{BufferEditPrediction, Zeta};
|
|
|
|
pub struct ZetaEditPredictionProvider {
|
|
zeta: Entity<Zeta>,
|
|
next_pending_prediction_id: usize,
|
|
pending_predictions: ArrayVec<PendingPrediction, 2>,
|
|
last_request_timestamp: Instant,
|
|
project: Entity<Project>,
|
|
}
|
|
|
|
impl ZetaEditPredictionProvider {
|
|
pub const THROTTLE_TIMEOUT: Duration = Duration::from_millis(300);
|
|
|
|
pub fn new(
|
|
project: Entity<Project>,
|
|
client: &Arc<Client>,
|
|
user_store: &Entity<UserStore>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let zeta = Zeta::global(client, user_store, cx);
|
|
zeta.update(cx, |zeta, cx| {
|
|
zeta.register_project(&project, cx);
|
|
});
|
|
|
|
Self {
|
|
zeta,
|
|
next_pending_prediction_id: 0,
|
|
pending_predictions: ArrayVec::new(),
|
|
last_request_timestamp: Instant::now(),
|
|
project: project,
|
|
}
|
|
}
|
|
}
|
|
|
|
struct PendingPrediction {
|
|
id: usize,
|
|
_task: Task<()>,
|
|
}
|
|
|
|
impl EditPredictionProvider for ZetaEditPredictionProvider {
|
|
fn name() -> &'static str {
|
|
"zed-predict2"
|
|
}
|
|
|
|
fn display_name() -> &'static str {
|
|
"Zed's Edit Predictions 2"
|
|
}
|
|
|
|
fn show_completions_in_menu() -> bool {
|
|
true
|
|
}
|
|
|
|
fn show_tab_accept_marker() -> bool {
|
|
true
|
|
}
|
|
|
|
fn data_collection_state(&self, _cx: &App) -> DataCollectionState {
|
|
// TODO [zeta2]
|
|
DataCollectionState::Unsupported
|
|
}
|
|
|
|
fn toggle_data_collection(&mut self, _cx: &mut App) {
|
|
// TODO [zeta2]
|
|
}
|
|
|
|
fn usage(&self, cx: &App) -> Option<client::EditPredictionUsage> {
|
|
self.zeta.read(cx).usage(cx)
|
|
}
|
|
|
|
fn is_enabled(
|
|
&self,
|
|
_buffer: &Entity<language::Buffer>,
|
|
_cursor_position: language::Anchor,
|
|
_cx: &App,
|
|
) -> bool {
|
|
true
|
|
}
|
|
|
|
fn is_refreshing(&self) -> bool {
|
|
!self.pending_predictions.is_empty()
|
|
}
|
|
|
|
fn refresh(
|
|
&mut self,
|
|
buffer: Entity<language::Buffer>,
|
|
cursor_position: language::Anchor,
|
|
_debounce: bool,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let zeta = self.zeta.read(cx);
|
|
|
|
if zeta.user_store.read_with(cx, |user_store, _cx| {
|
|
user_store.account_too_young() || user_store.has_overdue_invoices()
|
|
}) {
|
|
return;
|
|
}
|
|
|
|
if let Some(current) = zeta.current_prediction_for_buffer(&buffer, &self.project, cx)
|
|
&& let BufferEditPrediction::Local { prediction } = current
|
|
&& prediction.interpolate(buffer.read(cx)).is_some()
|
|
{
|
|
return;
|
|
}
|
|
|
|
let pending_prediction_id = self.next_pending_prediction_id;
|
|
self.next_pending_prediction_id += 1;
|
|
let last_request_timestamp = self.last_request_timestamp;
|
|
|
|
let project = self.project.clone();
|
|
let task = cx.spawn(async move |this, cx| {
|
|
if let Some(timeout) = (last_request_timestamp + Self::THROTTLE_TIMEOUT)
|
|
.checked_duration_since(Instant::now())
|
|
{
|
|
cx.background_executor().timer(timeout).await;
|
|
}
|
|
|
|
let refresh_task = this.update(cx, |this, cx| {
|
|
this.last_request_timestamp = Instant::now();
|
|
this.zeta.update(cx, |zeta, cx| {
|
|
zeta.refresh_prediction(&project, &buffer, cursor_position, cx)
|
|
})
|
|
});
|
|
|
|
if let Some(refresh_task) = refresh_task.ok() {
|
|
refresh_task.await.log_err();
|
|
}
|
|
|
|
this.update(cx, |this, cx| {
|
|
if this.pending_predictions[0].id == pending_prediction_id {
|
|
this.pending_predictions.remove(0);
|
|
} else {
|
|
this.pending_predictions.clear();
|
|
}
|
|
|
|
cx.notify();
|
|
})
|
|
.ok();
|
|
});
|
|
|
|
// We always maintain at most two pending predictions. When we already
|
|
// have two, we replace the newest one.
|
|
if self.pending_predictions.len() <= 1 {
|
|
self.pending_predictions.push(PendingPrediction {
|
|
id: pending_prediction_id,
|
|
_task: task,
|
|
});
|
|
} else if self.pending_predictions.len() == 2 {
|
|
self.pending_predictions.pop();
|
|
self.pending_predictions.push(PendingPrediction {
|
|
id: pending_prediction_id,
|
|
_task: task,
|
|
});
|
|
}
|
|
|
|
cx.notify();
|
|
}
|
|
|
|
fn cycle(
|
|
&mut self,
|
|
_buffer: Entity<language::Buffer>,
|
|
_cursor_position: language::Anchor,
|
|
_direction: Direction,
|
|
_cx: &mut Context<Self>,
|
|
) {
|
|
}
|
|
|
|
fn accept(&mut self, cx: &mut Context<Self>) {
|
|
self.zeta.update(cx, |zeta, _cx| {
|
|
zeta.accept_current_prediction(&self.project);
|
|
});
|
|
self.pending_predictions.clear();
|
|
}
|
|
|
|
fn discard(&mut self, cx: &mut Context<Self>) {
|
|
self.zeta.update(cx, |zeta, _cx| {
|
|
zeta.discard_current_prediction(&self.project);
|
|
});
|
|
self.pending_predictions.clear();
|
|
}
|
|
|
|
fn suggest(
|
|
&mut self,
|
|
buffer: &Entity<language::Buffer>,
|
|
cursor_position: language::Anchor,
|
|
cx: &mut Context<Self>,
|
|
) -> Option<edit_prediction::EditPrediction> {
|
|
let prediction =
|
|
self.zeta
|
|
.read(cx)
|
|
.current_prediction_for_buffer(buffer, &self.project, cx)?;
|
|
|
|
let prediction = match prediction {
|
|
BufferEditPrediction::Local { prediction } => prediction,
|
|
BufferEditPrediction::Jump { prediction } => {
|
|
return Some(edit_prediction::EditPrediction::Jump {
|
|
id: Some(prediction.id.to_string().into()),
|
|
snapshot: prediction.snapshot.clone(),
|
|
target: prediction.edits.first().unwrap().0.start,
|
|
});
|
|
}
|
|
};
|
|
|
|
let buffer = buffer.read(cx);
|
|
let snapshot = buffer.snapshot();
|
|
|
|
let Some(edits) = prediction.interpolate(&snapshot) else {
|
|
self.zeta.update(cx, |zeta, _cx| {
|
|
zeta.discard_current_prediction(&self.project);
|
|
});
|
|
return None;
|
|
};
|
|
|
|
let cursor_row = cursor_position.to_point(&snapshot).row;
|
|
let (closest_edit_ix, (closest_edit_range, _)) =
|
|
edits.iter().enumerate().min_by_key(|(_, (range, _))| {
|
|
let distance_from_start = cursor_row.abs_diff(range.start.to_point(&snapshot).row);
|
|
let distance_from_end = cursor_row.abs_diff(range.end.to_point(&snapshot).row);
|
|
cmp::min(distance_from_start, distance_from_end)
|
|
})?;
|
|
|
|
let mut edit_start_ix = closest_edit_ix;
|
|
for (range, _) in edits[..edit_start_ix].iter().rev() {
|
|
let distance_from_closest_edit = closest_edit_range.start.to_point(&snapshot).row
|
|
- range.end.to_point(&snapshot).row;
|
|
if distance_from_closest_edit <= 1 {
|
|
edit_start_ix -= 1;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
let mut edit_end_ix = closest_edit_ix + 1;
|
|
for (range, _) in &edits[edit_end_ix..] {
|
|
let distance_from_closest_edit =
|
|
range.start.to_point(buffer).row - closest_edit_range.end.to_point(&snapshot).row;
|
|
if distance_from_closest_edit <= 1 {
|
|
edit_end_ix += 1;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
Some(edit_prediction::EditPrediction::Local {
|
|
id: Some(prediction.id.to_string().into()),
|
|
edits: edits[edit_start_ix..edit_end_ix].to_vec(),
|
|
edit_preview: Some(prediction.edit_preview.clone()),
|
|
})
|
|
}
|
|
}
|