From ca01c69720a2900dfbfb5b162643ac8a875beec1 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 6 Oct 2020 22:45:46 +0200 Subject: [PATCH] Finalize test for #107739 --- .../src/singlefolder-tests/workspace.test.ts | 14 +++++++------- src/vs/platform/undoRedo/common/undoRedoService.ts | 13 +++++-------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts index 42eadce5857..25a8a7925e6 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts @@ -1006,13 +1006,13 @@ suite('vscode API - workspace', () => { assert.equal(document.getText(), 'hello'); } - // // redo and show the new document - // { - // await vscode.commands.executeCommand('redo'); - // const document = await vscode.workspace.openTextDocument(newFile); - // await vscode.window.showTextDocument(document); - // assert.equal(document.getText(), 'hello2'); - // } + // redo and show the new document + { + await vscode.commands.executeCommand('redo'); + const document = await vscode.workspace.openTextDocument(newFile); + await vscode.window.showTextDocument(document); + assert.equal(document.getText(), 'hello2'); + } }); }); diff --git a/src/vs/platform/undoRedo/common/undoRedoService.ts b/src/vs/platform/undoRedo/common/undoRedoService.ts index 45bc17c16c0..2a5bdb84dc0 100644 --- a/src/vs/platform/undoRedo/common/undoRedoService.ts +++ b/src/vs/platform/undoRedo/common/undoRedoService.ts @@ -741,27 +741,24 @@ export class UndoRedoService implements IUndoRedoService { return result; } - private _invokeResourcePrepare(element: ResourceStackElement, callback: (disposable: IDisposable) => void): void | Promise { + private _invokeResourcePrepare(element: ResourceStackElement, callback: (disposable: IDisposable) => Promise | void): void | Promise { if (element.actual.type !== UndoRedoElementType.Workspace || typeof element.actual.prepareUndoRedo === 'undefined') { // no preparation needed - callback(Disposable.None); - return; + return callback(Disposable.None); } const r = element.actual.prepareUndoRedo(); if (!r) { // nothing to clean up - callback(Disposable.None); - return; + return callback(Disposable.None); } if (isDisposable(r)) { - callback(r); - return; + return callback(r); } return r.then((disposable) => { - callback(disposable); + return callback(disposable); }); }