DEV/microsoft_vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finalize test for #107739

Browse Source
This commit is contained in:
Alex Dima 2020-10-06 22:45:46 +02:00
parent 443508c4c9
commit ca01c69720
No known key found for this signature in database
GPG Key ID: 6E58D7B045760DA0
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
View File

@ -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');
}
});
});

13
src/vs/platform/undoRedo/common/undoRedoService.ts
View File

@ -741,27 +741,24 @@ export class UndoRedoService implements IUndoRedoService {
return result;
}
private _invokeResourcePrepare(element: ResourceStackElement, callback: (disposable: IDisposable) => void): void | Promise<void> {
private _invokeResourcePrepare(element: ResourceStackElement, callback: (disposable: IDisposable) => Promise<void> | void): void | Promise<void> {
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);
});
}