Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2.3 KiB
2.3 KiB
+++ repository_url = "git@github.com:zed-industries/zed" revision = "be5763632dccb33470ca233c36ccd9e5e790e3b2" +++
This prediction requires the model to see the project::Event enum.
Edit History
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -1035,7 +1035,7 @@
project_state.recent_paths.push_front(path);
}
}
- project::Event::DiagnosticsUpdated { .. } => {
+ project::Event::Disk { .. } => {
if cx.has_flag::<EditPredictionJumpsFeatureFlag>() {
self.refresh_prediction_from_diagnostics(
project,
Cursor Position
{
project_state.recent_paths.remove(ix);
}
project_state.recent_paths.push_front(path);
}
}
project::Event::Disk { .. } => {
// ^[CURSOR_POSITION]
if cx.has_flag::<EditPredictionJumpsFeatureFlag>() {
self.refresh_prediction_from_diagnostics(
project,
Expected Patch
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -1032,10 +1032,10 @@
project_state.recent_paths.push_front(path);
}
}
- project::Event::Disk { .. } => {
+ project::Event::DiskBasedDiagnosticsFinished { .. } => {
if cx.has_flag::<EditPredictionJumpsFeatureFlag>() {
self.refresh_prediction_from_diagnostics(
project,
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -1032,10 +1032,10 @@
project_state.recent_paths.push_front(path);
}
}
- project::Event::Disk { .. } => {
+ project::Event::DiskBasedDiagnosticsStarted { .. } => {
if cx.has_flag::<EditPredictionJumpsFeatureFlag>() {
self.refresh_prediction_from_diagnostics(
project,