b9819977a5
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>
57 lines
1.8 KiB
Markdown
57 lines
1.8 KiB
Markdown
+++
|
|
repository_url = "https://github.com/microsoft/vscode"
|
|
revision = "e28a92fc1fbe9de11eca2f8ad19899334bff8525"
|
|
+++
|
|
|
|
This prediction requires the model to see the `IDiffComputationResult` type definition.
|
|
|
|
## Edit History
|
|
|
|
```diff
|
|
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
|
|
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
|
|
@@ -1117,6 +1117,7 @@
|
|
&& currentModifiedModel === this._modifiedEditor.getModel()
|
|
) {
|
|
this._setState(editorBrowser.DiffEditorState.DiffComputed);
|
|
+ console.log("did quit:")
|
|
this._diffComputationResult = result;
|
|
this._updateDecorationsRunner.schedule();
|
|
this._onDidUpdateDiff.fire();
|
|
```
|
|
|
|
## Cursor Position
|
|
|
|
```src/vs/editor/browser/widget/diffEditorWidget.ts
|
|
if (currentToken === this._diffComputationToken
|
|
&& currentOriginalModel === this._originalEditor.getModel()
|
|
&& currentModifiedModel === this._modifiedEditor.getModel()
|
|
) {
|
|
this._setState(editorBrowser.DiffEditorState.DiffComputed);
|
|
console.log("did quit:")
|
|
// ^[CURSOR_POSITION]
|
|
this._diffComputationResult = result;
|
|
this._updateDecorationsRunner.schedule();
|
|
this._onDidUpdateDiff.fire();
|
|
}
|
|
```
|
|
|
|
## Expected Patch
|
|
|
|
```diff
|
|
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
|
|
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
|
|
@@ -1115,10 +1115,10 @@
|
|
if (currentToken === this._diffComputationToken
|
|
&& currentOriginalModel === this._originalEditor.getModel()
|
|
&& currentModifiedModel === this._modifiedEditor.getModel()
|
|
) {
|
|
this._setState(editorBrowser.DiffEditorState.DiffComputed);
|
|
- console.log("did quit:")
|
|
+ console.log("did quit:", result.quitEarly)
|
|
this._diffComputationResult = result;
|
|
this._updateDecorationsRunner.schedule();
|
|
this._onDidUpdateDiff.fire();
|
|
}
|
|
```
|