diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 4168b8c4977..360d0f4afdb 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -14,7 +14,7 @@ import * as platform from 'vs/base/common/platform'; import { EventType as TouchEventType } from 'vs/base/browser/touch'; import { KeyCode } from 'vs/base/common/keyCodes'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import Event, { Emitter, EventBufferer, chain, mapEvent, fromCallback, any } from 'vs/base/common/event'; +import Event, { Emitter, EventBufferer, chain, mapEvent, fromCallback, anyEvent } from 'vs/base/common/event'; import { domEvent } from 'vs/base/browser/event'; import { IDelegate, IRenderer, IListEvent, IListMouseEvent, IListContextMenuEvent } from './list'; import { ListView, IListViewOptions } from './listView'; @@ -347,7 +347,7 @@ class MouseController implements IDisposable { .map(({ element, index, clientX, clientY }) => ({ element, index, anchor: { x: clientX + 1, y: clientY } })) .event; - return any>(fromKeyboard, fromMouse); + return anyEvent>(fromKeyboard, fromMouse); } constructor( diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 19ad6dd8657..387ea5055cb 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -304,7 +304,7 @@ export function once(event: Event): Event { }; } -export function any(...events: Event[]): Event { +export function anyEvent(...events: Event[]): Event { return (listener, thisArgs = null, disposables?) => combinedDisposable(events.map(event => event(e => listener.call(thisArgs, e), null, disposables))); } diff --git a/src/vs/platform/url/electron-main/urlService.ts b/src/vs/platform/url/electron-main/urlService.ts index 01e4a8895a2..2a7f2904df8 100644 --- a/src/vs/platform/url/electron-main/urlService.ts +++ b/src/vs/platform/url/electron-main/urlService.ts @@ -5,7 +5,7 @@ 'use strict'; -import Event, { mapEvent, chain, echo, Emitter, any } from 'vs/base/common/event'; +import Event, { mapEvent, chain, echo, Emitter, anyEvent } from 'vs/base/common/event'; import { fromEventEmitter } from 'vs/base/node/event'; import { IURLService } from 'vs/platform/url/common/url'; import product from 'vs/platform/node/product'; @@ -39,7 +39,7 @@ export class URLService implements IURLService { // echo all `onOpenUrl` events to each listener const bufferedOnOpenUrl = echo(preventedOnOpenUrl, true, initialBuffer); - this.onOpenURL = chain(any(bufferedOnOpenUrl, this.openUrlEmitter.event)) + this.onOpenURL = chain(anyEvent(bufferedOnOpenUrl, this.openUrlEmitter.event)) .map(url => { try { return URI.parse(url); @@ -54,4 +54,4 @@ export class URLService implements IURLService { open(url: string): void { this.openUrlEmitter.fire(url); } -} \ No newline at end of file +} diff --git a/src/vs/platform/windows/electron-browser/windowService.ts b/src/vs/platform/windows/electron-browser/windowService.ts index 0523a4b15b1..daa5a0bec47 100644 --- a/src/vs/platform/windows/electron-browser/windowService.ts +++ b/src/vs/platform/windows/electron-browser/windowService.ts @@ -5,7 +5,7 @@ 'use strict'; -import Event, { filterEvent, mapEvent, any } from 'vs/base/common/event'; +import Event, { filterEvent, mapEvent, anyEvent } from 'vs/base/common/event'; import { TPromise } from 'vs/base/common/winjs.base'; import { IWindowService, IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult } from 'vs/platform/windows/common/windows'; import { remote } from 'electron'; @@ -26,7 +26,7 @@ export class WindowService implements IWindowService { ) { const onThisWindowFocus = mapEvent(filterEvent(windowsService.onWindowFocus, id => id === windowId), _ => true); const onThisWindowBlur = mapEvent(filterEvent(windowsService.onWindowBlur, id => id === windowId), _ => false); - this.onDidChangeFocus = any(onThisWindowFocus, onThisWindowBlur); + this.onDidChangeFocus = anyEvent(onThisWindowFocus, onThisWindowBlur); } getCurrentWindowId(): number { diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts index 2b8ed719ea3..72e3aae237b 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts @@ -7,7 +7,7 @@ import * as arrays from 'vs/base/common/arrays'; import { localize } from 'vs/nls'; -import Event, { chain, any, debounceEvent } from 'vs/base/common/event'; +import Event, { chain, anyEvent, debounceEvent } from 'vs/base/common/event'; import { onUnexpectedError, canceled } from 'vs/base/common/errors'; import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; @@ -123,8 +123,8 @@ export class KeymapExtensions implements IWorkbenchContribution { export function onExtensionChanged(accessor: ServicesAccessor): Event { const extensionService = accessor.get(IExtensionManagementService); const extensionEnablementService = accessor.get(IExtensionEnablementService); - return debounceEvent(any( - chain(any(extensionService.onDidInstallExtension, extensionService.onDidUninstallExtension)) + return debounceEvent(anyEvent( + chain(anyEvent(extensionService.onDidInstallExtension, extensionService.onDidUninstallExtension)) .map(e => stripVersion(e.id)) .event, extensionEnablementService.onEnablementChanged diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index ec011aa71c6..d5fa6d871cf 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -11,7 +11,7 @@ import 'vs/css!./media/dirtydiffDecorator'; import { ThrottledDelayer, always } from 'vs/base/common/async'; import { IDisposable, dispose, toDisposable, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; -import Event, { Emitter, any as anyEvent, filterEvent, once } from 'vs/base/common/event'; +import Event, { Emitter, anyEvent as anyEvent, filterEvent, once } from 'vs/base/common/event'; import * as ext from 'vs/workbench/common/contributions'; import { CodeEditor } from 'vs/editor/browser/codeEditor'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts b/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts index 2558e2a1717..0ecdc26d618 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts @@ -8,7 +8,7 @@ import { localize } from 'vs/nls'; import { basename } from 'vs/base/common/paths'; import { IDisposable, dispose, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; -import { filterEvent, any as anyEvent } from 'vs/base/common/event'; +import { filterEvent, anyEvent as anyEvent } from 'vs/base/common/event'; import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm'; import { ISCMService, ISCMRepository } from 'vs/workbench/services/scm/common/scm'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; @@ -159,4 +159,4 @@ export class StatusBarController implements IWorkbenchContribution { this.statusBarDisposable.dispose(); this.disposables = dispose(this.disposables); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts index d90eda8bb39..717213f614c 100644 --- a/src/vs/workbench/parts/search/common/searchModel.ts +++ b/src/vs/workbench/parts/search/common/searchModel.ts @@ -12,7 +12,7 @@ import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; import { TPromise, PPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import { values, ResourceMap, TernarySearchTree } from 'vs/base/common/map'; -import Event, { Emitter, fromPromise, stopwatch, any } from 'vs/base/common/event'; +import Event, { Emitter, fromPromise, stopwatch, anyEvent } from 'vs/base/common/event'; import { ISearchService, ISearchProgressItem, ISearchComplete, ISearchQuery, IPatternInfo, IFileMatch } from 'vs/platform/search/common/search'; import { ReplacePattern } from 'vs/platform/search/common/replace'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @@ -728,7 +728,7 @@ export class SearchModel extends Disposable { const onDone = fromPromise(this.currentRequest); const progressEmitter = new Emitter(); - const onFirstRender = any(onDone, progressEmitter.event); + const onFirstRender = anyEvent(onDone, progressEmitter.event); const onFirstRenderStopwatch = stopwatch(onFirstRender); /* __GDPR__ "searchResultsFirstRender" : { diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts index cd004e68f20..b86c53e0458 100644 --- a/src/vs/workbench/services/decorations/browser/decorationsService.ts +++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts @@ -5,7 +5,7 @@ 'use strict'; import URI from 'vs/base/common/uri'; -import Event, { Emitter, debounceEvent, any } from 'vs/base/common/event'; +import Event, { Emitter, debounceEvent, anyEvent } from 'vs/base/common/event'; import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from './decorations'; import { TernarySearchTree } from 'vs/base/common/map'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; @@ -317,7 +317,7 @@ export class FileDecorationsService implements IDecorationsService { private readonly _decorationStyles: DecorationStyles; private readonly _disposables: IDisposable[]; - readonly onDidChangeDecorations: Event = any( + readonly onDidChangeDecorations: Event = anyEvent( this._onDidChangeDecorations.event, debounceEvent( this._onDidChangeDecorationsDelayed.event, diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index d4b17a7fbc3..126d98d7cc0 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -25,7 +25,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc'; import { generateRandomPipeName, Protocol } from 'vs/base/parts/ipc/node/ipc.net'; import { createServer, Server, Socket } from 'net'; -import Event, { Emitter, debounceEvent, mapEvent, any } from 'vs/base/common/event'; +import Event, { Emitter, debounceEvent, mapEvent, anyEvent } from 'vs/base/common/event'; import { fromEventEmitter } from 'vs/base/node/event'; import { IInitData, IWorkspaceData } from 'vs/workbench/api/node/extHost.protocol'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; @@ -171,7 +171,7 @@ export class ExtensionHostProcessWorker { this._extensionHostProcess.stderr.setEncoding('utf8'); const onStdout = fromEventEmitter(this._extensionHostProcess.stdout, 'data'); const onStderr = fromEventEmitter(this._extensionHostProcess.stderr, 'data'); - const onOutput = any( + const onOutput = anyEvent( mapEvent(onStdout, o => ({ data: `%c${o}`, format: [''] })), mapEvent(onStderr, o => ({ data: `%c${o}`, format: ['color: red'] })) );