From 67e9759d358d8ea15d576fdc34e63ffda5882eb9 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Mon, 18 Nov 2024 18:05:50 -0800 Subject: [PATCH] make history get added instantly so we can do interrupts --- .../void/browser/registerInlineDiffs.ts | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts b/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts index a7896252..e896543d 100644 --- a/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts +++ b/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts @@ -409,21 +409,20 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService { } const beforeSnapshot: HistorySnapshot = getCurrentSnapshot() - console.log('BEFORE', beforeSnapshot) + let afterSnapshot: HistorySnapshot | null = null + + const elt: IUndoRedoElement = { + type: UndoRedoElementType.Resource, + resource: model.uri, + label: 'Add Diffs', + code: 'undoredo.inlineDiffs', + undo: () => { restoreDiffAreas(beforeSnapshot) }, + redo: () => { if (afterSnapshot) restoreDiffAreas(afterSnapshot) } + } + this._undoRedoService.pushElement(elt) + const onFinishEdit = () => { - const afterSnapshot: HistorySnapshot = getCurrentSnapshot() - console.log('AFTER', afterSnapshot) - const elt: IUndoRedoElement = { - type: UndoRedoElementType.Resource, - resource: model.uri, - label: 'Add Diffs', - code: 'undoredo.inlineDiffs', - undo: () => { restoreDiffAreas(beforeSnapshot) }, - redo: () => { restoreDiffAreas(afterSnapshot) } - } - this._undoRedoService.pushElement(elt) - - + afterSnapshot = getCurrentSnapshot() } return { onFinishEdit } } @@ -547,7 +546,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService { // ----------- 2. Recompute sweep in the diffArea if streaming ----------- if (diffArea._sweepState.isStreaming) { - console.log('SWEEP STYLES', diffArea._sweepState.line, diffArea.endLine) const disposeSweepStyles = this._addSweepStyles(model, diffArea._sweepState.line, diffArea.endLine) diffArea._disposeSweepStyles = disposeSweepStyles }