diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 29b2d31a89e1645f9b67e7136fc28d34aec07e36..ca48a8ff9b9f76425985cca1b5130e6560381db7 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -233,8 +233,8 @@ export function fromCallback(fn: (handler: (e: T) => void) => IDisposable): E return emitter.event; } -export function fromPromise(promise: TPromise): Event { - const emitter = new Emitter(); +export function fromPromise(promise: TPromise): Event { + const emitter = new Emitter(); let shouldEmit = false; promise @@ -260,33 +260,6 @@ export function toPromise(event: Event): TPromise { }); } -export function delayed(promise: TPromise>): Event { - let toCancel: TPromise = null; - let listener: IDisposable = null; - - const emitter = new Emitter({ - onFirstListenerAdd() { - toCancel = promise.then( - event => listener = event(e => emitter.fire(e)), - () => null - ); - }, - onLastListenerRemove() { - if (toCancel) { - toCancel.cancel(); - toCancel = null; - } - - if (listener) { - listener.dispose(); - listener = null; - } - } - }); - - return emitter.event; -} - export function once(event: Event): Event { return (listener, thisArgs = null, disposables?) => { const result = event(e => { diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts index cd9a3adc2ababa316793f7232982796361f1271c..e72e2cd633806d83f7eeb1015e1db84f977241ae 100644 --- a/src/vs/workbench/parts/search/common/searchModel.ts +++ b/src/vs/workbench/parts/search/common/searchModel.ts @@ -732,7 +732,7 @@ export class SearchModel extends Disposable { const onDone = fromPromise(this.currentRequest); const progressEmitter = new Emitter(); - const onFirstRender = anyEvent(onDone, progressEmitter.event); + const onFirstRender = anyEvent(onDone, progressEmitter.event); const onFirstRenderStopwatch = stopwatch(onFirstRender); /* __GDPR__ "searchResultsFirstRender" : {