mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 01:32:34 -05:00
Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)
* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c * remove files we don't want * fix hygiene * update distro * update distro * fix hygiene * fix strict nulls * distro * distro * fix tests * fix tests * add another edit * fix viewlet icon * fix azure dialog * fix some padding * fix more padding issues
This commit is contained in:
@@ -3,10 +3,11 @@
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
import * as assert from 'assert';
|
||||
import { Event, Emitter, EventBufferer, EventMultiplexer, AsyncEmitter, IWaitUntil, PauseableEmitter } from 'vs/base/common/event';
|
||||
import { Event, Emitter, EventBufferer, EventMultiplexer, IWaitUntil, PauseableEmitter, AsyncEmitter } from 'vs/base/common/event';
|
||||
import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
|
||||
import * as Errors from 'vs/base/common/errors';
|
||||
import { timeout } from 'vs/base/common/async';
|
||||
import { CancellationToken } from 'vs/base/common/cancellation';
|
||||
|
||||
namespace Samples {
|
||||
|
||||
@@ -174,7 +175,7 @@ suite('Event', function () {
|
||||
test('Debounce Event', function (done: () => void) {
|
||||
let doc = new Samples.Document3();
|
||||
|
||||
let onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[], cur) => {
|
||||
let onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[] | undefined, cur) => {
|
||||
if (!prev) {
|
||||
prev = [cur];
|
||||
} else if (prev.indexOf(cur) < 0) {
|
||||
@@ -272,11 +273,7 @@ suite('AsyncEmitter', function () {
|
||||
assert.equal(typeof e.waitUntil, 'function');
|
||||
});
|
||||
|
||||
emitter.fireAsync(thenables => ({
|
||||
foo: true,
|
||||
bar: 1,
|
||||
waitUntil(t: Promise<void>) { thenables.push(t); }
|
||||
}));
|
||||
emitter.fireAsync({ foo: true, bar: 1, }, CancellationToken.None);
|
||||
emitter.dispose();
|
||||
});
|
||||
|
||||
@@ -303,12 +300,7 @@ suite('AsyncEmitter', function () {
|
||||
}));
|
||||
});
|
||||
|
||||
await emitter.fireAsync(thenables => ({
|
||||
foo: true,
|
||||
waitUntil(t) {
|
||||
thenables.push(t);
|
||||
}
|
||||
}));
|
||||
await emitter.fireAsync({ foo: true }, CancellationToken.None);
|
||||
assert.equal(globalState, 2);
|
||||
});
|
||||
|
||||
@@ -324,12 +316,7 @@ suite('AsyncEmitter', function () {
|
||||
emitter.event(e => {
|
||||
e.waitUntil(timeout(10).then(async _ => {
|
||||
if (e.foo === 1) {
|
||||
await emitter.fireAsync(thenables => ({
|
||||
foo: 2,
|
||||
waitUntil(t) {
|
||||
thenables.push(t);
|
||||
}
|
||||
}));
|
||||
await emitter.fireAsync({ foo: 2 }, CancellationToken.None);
|
||||
assert.deepEqual(events, [1, 2]);
|
||||
done = true;
|
||||
}
|
||||
@@ -342,14 +329,40 @@ suite('AsyncEmitter', function () {
|
||||
e.waitUntil(timeout(7));
|
||||
});
|
||||
|
||||
await emitter.fireAsync(thenables => ({
|
||||
foo: 1,
|
||||
waitUntil(t) {
|
||||
thenables.push(t);
|
||||
}
|
||||
}));
|
||||
await emitter.fireAsync({ foo: 1 }, CancellationToken.None);
|
||||
assert.ok(done);
|
||||
});
|
||||
|
||||
test('catch errors', async function () {
|
||||
const origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
|
||||
Errors.setUnexpectedErrorHandler(() => null);
|
||||
|
||||
interface E extends IWaitUntil {
|
||||
foo: boolean;
|
||||
}
|
||||
|
||||
let globalState = 0;
|
||||
let emitter = new AsyncEmitter<E>();
|
||||
|
||||
emitter.event(e => {
|
||||
globalState += 1;
|
||||
e.waitUntil(new Promise((_r, reject) => reject(new Error())));
|
||||
});
|
||||
|
||||
emitter.event(e => {
|
||||
globalState += 1;
|
||||
e.waitUntil(timeout(10));
|
||||
});
|
||||
|
||||
await emitter.fireAsync({ foo: true }, CancellationToken.None).then(() => {
|
||||
assert.equal(globalState, 2);
|
||||
}).catch(e => {
|
||||
console.log(e);
|
||||
assert.ok(false);
|
||||
});
|
||||
|
||||
Errors.setUnexpectedErrorHandler(origErrorHandler);
|
||||
});
|
||||
});
|
||||
|
||||
suite('PausableEmitter', function () {
|
||||
|
||||
Reference in New Issue
Block a user