Skip to content

Commit b776182

Browse files
jriekenjrieken
committed
debt - less TPromise
1 parent 5c6694c commit b776182

6 files changed

Lines changed: 18 additions & 21 deletions

File tree

‎src/vs/base/common/event.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
77
import { once as onceFn } from 'vs/base/common/functional';
88
import { combinedDisposable, Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
99
import { LinkedList } from 'vs/base/common/linkedList';
10-
import { TPromise } from 'vs/base/common/winjs.base';
1110

1211
/**
1312
* To an event a function with one or zero parameters
@@ -292,10 +291,6 @@ export function fromPromise<T =any>(promise: Thenable<T>): Event<T> {
292291
}
293292

294293
export function toPromise<T>(event: Event<T>): Thenable<T> {
295-
return new TPromise(c => once(event)(c));
296-
}
297-
298-
export function toNativePromise<T>(event: Event<T>): Thenable<T> {
299294
return new Promise(c => once(event)(c));
300295
}
301296

‎src/vs/base/parts/ipc/node/ipc.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
7-
import { Event, Emitter, once, filterEvent, toNativePromise, Relay } from 'vs/base/common/event';
7+
import { Event, Emitter, once, filterEvent, toPromise, Relay } from 'vs/base/common/event';
88
import { always, CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
99
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
1010
import * as errors from 'vs/base/common/errors';
@@ -447,7 +447,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
447447
if (this.state === State.Idle) {
448448
return Promise.resolve();
449449
} else {
450-
return toNativePromise(this.onDidInitialize);
450+
return toPromise(this.onDidInitialize);
451451
}
452452
}
453453

@@ -638,4 +638,4 @@ export function getNextTickChannel<T extends IChannel>(channel: T): T {
638638
return relay.event;
639639
}
640640
} as T;
641-
}
641+
}

‎src/vs/base/parts/ipc/test/node/ipc.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as assert from 'assert';
77
import { IMessagePassingProtocol, IPCServer, ClientConnectionEvent, IPCClient, IChannel } from 'vs/base/parts/ipc/node/ipc';
8-
import { Emitter, toNativePromise, Event } from 'vs/base/common/event';
8+
import { Emitter, toPromise, Event } from 'vs/base/common/event';
99
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
1010
import { canceled } from 'vs/base/common/errors';
1111
import { timeout } from 'vs/base/common/async';
@@ -202,8 +202,8 @@ suite('Base IPC', function () {
202202
const b3 = Buffer.alloc(0);
203203
serverProtocol.send(b3);
204204

205-
const b2 = await toNativePromise(serverProtocol.onMessage);
206-
const b4 = await toNativePromise(clientProtocol.onMessage);
205+
const b2 = await toPromise(serverProtocol.onMessage);
206+
const b4 = await toPromise(clientProtocol.onMessage);
207207

208208
assert.strictEqual(b1, b2);
209209
assert.strictEqual(b3, b4);

‎src/vs/base/test/common/event.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import * as assert from 'assert';
66
import { Event, Emitter, debounceEvent, EventBufferer, once, fromPromise, stopwatch, buffer, echo, EventMultiplexer, latch, AsyncEmitter, IWaitUntil } from 'vs/base/common/event';
77
import { IDisposable } from 'vs/base/common/lifecycle';
88
import * as Errors from 'vs/base/common/errors';
9-
import { TPromise } from 'vs/base/common/winjs.base';
109
import { timeout } from 'vs/base/common/async';
1110

1211
namespace Samples {
@@ -441,7 +440,7 @@ suite('Event utils', () => {
441440
const emitter = new Emitter<void>();
442441
const event = stopwatch(emitter.event);
443442

444-
return new TPromise((c, e) => {
443+
return new Promise((c, e) => {
445444
event(duration => {
446445
try {
447446
assert(duration > 0);

‎src/vs/workbench/services/commands/common/commandService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
77
import { ICommandService, ICommandEvent, CommandsRegistry } from 'vs/platform/commands/common/commands';
88
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
9-
import { Event, Emitter, filterEvent, toNativePromise } from 'vs/base/common/event';
9+
import { Event, Emitter, filterEvent, toPromise } from 'vs/base/common/event';
1010
import { Disposable } from 'vs/base/common/lifecycle';
1111
import { ILogService } from 'vs/platform/log/common/log';
1212

@@ -46,7 +46,7 @@ export class CommandService extends Disposable implements ICommandService {
4646
waitFor = Promise.race<any>([
4747
// race activation events against command registration
4848
Promise.all([activation, this._extensionService.activateByEvent(`*`)]),
49-
toNativePromise(filterEvent(CommandsRegistry.onDidRegisterCommand, e => e === id)),
49+
toPromise(filterEvent(CommandsRegistry.onDidRegisterCommand, e => e === id)),
5050
]);
5151
}
5252
return (waitFor as Promise<any>).then(_ => this._tryExecuteCommand(id, args));

‎src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,16 @@ suite('DecorationsService', function () {
9393

9494
// un-register -> ensure good event
9595
let didSeeEvent = false;
96-
let p = toPromise(service.onDidChangeDecorations).then(e => {
97-
assert.equal(e.affectsResource(uri), true);
98-
assert.deepEqual(service.getDecoration(uri, false), undefined);
99-
assert.equal(callCounter, 1);
100-
didSeeEvent = true;
96+
let p = new Promise(resolve => {
97+
service.onDidChangeDecorations(e => {
98+
assert.equal(e.affectsResource(uri), true);
99+
assert.deepEqual(service.getDecoration(uri, false), undefined);
100+
assert.equal(callCounter, 1);
101+
didSeeEvent = true;
102+
resolve();
103+
});
101104
});
102-
reg.dispose();
105+
reg.dispose(); // will clear all data
103106
await p;
104107
assert.equal(didSeeEvent, true);
105108
});

0 commit comments

Comments
 (0)