development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-31 10:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

debt - a tiny bit of promise removal

Browse source
This commit is contained in:
Johannes Rieken 2018-08-16 16:00:07 +02:00
parent 9842fb4d61
commit f8dad22a02
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/base/common/event.ts
View file

@ -8,7 +8,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import { once as onceFn } from 'vs/base/common/functional'; import { once as onceFn } from 'vs/base/common/functional';
import { combinedDisposable, Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { combinedDisposable, Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { LinkedList } from 'vs/base/common/linkedList'; import { LinkedList } from 'vs/base/common/linkedList';
import { TPromise } from 'vs/base/common/winjs.base';
/** /**
* To an event a function with one or zero parameters * To an event a function with one or zero parameters
@ -277,7 +276,7 @@ export function fromCallback<T>(fn: (handler: (e: T) => void) => IDisposable): E
return emitter.event; return emitter.event;
} }
export function fromPromise<T =any>(promise: TPromise<T>): Event<T> { export function fromPromise<T =any>(promise: Thenable<T>): Event<T> {
const emitter = new Emitter<T>(); const emitter = new Emitter<T>();
let shouldEmit = false; let shouldEmit = false;
@ -295,8 +294,8 @@ export function fromPromise<T =any>(promise: TPromise<T>): Event<T> {
return emitter.event; return emitter.event;
} }
export function toPromise<T>(event: Event<T>): TPromise<T> { export function toPromise<T>(event: Event<T>): Promise<T> {
return new TPromise(complete => { return new Promise(complete => {
const sub = event(e => { const sub = event(e => {
sub.dispose(); sub.dispose();
complete(e); complete(e);

2
src/vs/base/parts/ipc/common/ipc.ts
View file

@ -375,7 +375,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
if (this.state === State.Idle) { if (this.state === State.Idle) {
return TPromise.as(null); return TPromise.as(null);
} else { } else {
return toPromise(this.onDidInitialize); return TPromise.wrap(toPromise(this.onDidInitialize));
} }
} }