Skip to content

Commit b6bd1ae

Browse files
jriekenjrieken
committed
rename event.any to event.anyEvent
1 parent bd1219f commit b6bd1ae

10 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/vs/base/browser/ui/list/listWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import * as platform from 'vs/base/common/platform';
1414
import { EventType as TouchEventType } from 'vs/base/browser/touch';
1515
import { KeyCode } from 'vs/base/common/keyCodes';
1616
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
17-
import Event, { Emitter, EventBufferer, chain, mapEvent, fromCallback, any } from 'vs/base/common/event';
17+
import Event, { Emitter, EventBufferer, chain, mapEvent, fromCallback, anyEvent } from 'vs/base/common/event';
1818
import { domEvent } from 'vs/base/browser/event';
1919
import { IDelegate, IRenderer, IListEvent, IListMouseEvent, IListContextMenuEvent } from './list';
2020
import { ListView, IListViewOptions } from './listView';
@@ -347,7 +347,7 @@ class MouseController<T> implements IDisposable {
347347
.map(({ element, index, clientX, clientY }) => ({ element, index, anchor: { x: clientX + 1, y: clientY } }))
348348
.event;
349349

350-
return any<IListContextMenuEvent<T>>(fromKeyboard, fromMouse);
350+
return anyEvent<IListContextMenuEvent<T>>(fromKeyboard, fromMouse);
351351
}
352352

353353
constructor(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export function once<T>(event: Event<T>): Event<T> {
304304
};
305305
}
306306

307-
export function any<T>(...events: Event<T>[]): Event<T> {
307+
export function anyEvent<T>(...events: Event<T>[]): Event<T> {
308308
return (listener, thisArgs = null, disposables?) => combinedDisposable(events.map(event => event(e => listener.call(thisArgs, e), null, disposables)));
309309
}
310310

‎src/vs/platform/url/electron-main/urlService.ts‎

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

66
'use strict';
77

8-
import Event, { mapEvent, chain, echo, Emitter, any } from 'vs/base/common/event';
8+
import Event, { mapEvent, chain, echo, Emitter, anyEvent } from 'vs/base/common/event';
99
import { fromEventEmitter } from 'vs/base/node/event';
1010
import { IURLService } from 'vs/platform/url/common/url';
1111
import product from 'vs/platform/node/product';
@@ -39,7 +39,7 @@ export class URLService implements IURLService {
3939
// echo all `onOpenUrl` events to each listener
4040
const bufferedOnOpenUrl = echo(preventedOnOpenUrl, true, initialBuffer);
4141

42-
this.onOpenURL = chain(any(bufferedOnOpenUrl, this.openUrlEmitter.event))
42+
this.onOpenURL = chain(anyEvent(bufferedOnOpenUrl, this.openUrlEmitter.event))
4343
.map(url => {
4444
try {
4545
return URI.parse(url);
@@ -54,4 +54,4 @@ export class URLService implements IURLService {
5454
open(url: string): void {
5555
this.openUrlEmitter.fire(url);
5656
}
57-
}
57+
}

‎src/vs/platform/windows/electron-browser/windowService.ts‎

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

66
'use strict';
77

8-
import Event, { filterEvent, mapEvent, any } from 'vs/base/common/event';
8+
import Event, { filterEvent, mapEvent, anyEvent } from 'vs/base/common/event';
99
import { TPromise } from 'vs/base/common/winjs.base';
1010
import { IWindowService, IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult } from 'vs/platform/windows/common/windows';
1111
import { remote } from 'electron';
@@ -26,7 +26,7 @@ export class WindowService implements IWindowService {
2626
) {
2727
const onThisWindowFocus = mapEvent(filterEvent(windowsService.onWindowFocus, id => id === windowId), _ => true);
2828
const onThisWindowBlur = mapEvent(filterEvent(windowsService.onWindowBlur, id => id === windowId), _ => false);
29-
this.onDidChangeFocus = any(onThisWindowFocus, onThisWindowBlur);
29+
this.onDidChangeFocus = anyEvent(onThisWindowFocus, onThisWindowBlur);
3030
}
3131

3232
getCurrentWindowId(): number {

‎src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts‎

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

88
import * as arrays from 'vs/base/common/arrays';
99
import { localize } from 'vs/nls';
10-
import Event, { chain, any, debounceEvent } from 'vs/base/common/event';
10+
import Event, { chain, anyEvent, debounceEvent } from 'vs/base/common/event';
1111
import { onUnexpectedError, canceled } from 'vs/base/common/errors';
1212
import { TPromise } from 'vs/base/common/winjs.base';
1313
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -123,8 +123,8 @@ export class KeymapExtensions implements IWorkbenchContribution {
123123
export function onExtensionChanged(accessor: ServicesAccessor): Event<string[]> {
124124
const extensionService = accessor.get(IExtensionManagementService);
125125
const extensionEnablementService = accessor.get(IExtensionEnablementService);
126-
return debounceEvent<string, string[]>(any(
127-
chain(any(extensionService.onDidInstallExtension, extensionService.onDidUninstallExtension))
126+
return debounceEvent<string, string[]>(anyEvent(
127+
chain(anyEvent(extensionService.onDidInstallExtension, extensionService.onDidUninstallExtension))
128128
.map(e => stripVersion(e.id))
129129
.event,
130130
extensionEnablementService.onEnablementChanged

‎src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'vs/css!./media/dirtydiffDecorator';
1111
import { ThrottledDelayer, always } from 'vs/base/common/async';
1212
import { IDisposable, dispose, toDisposable, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
1313
import { TPromise } from 'vs/base/common/winjs.base';
14-
import Event, { Emitter, any as anyEvent, filterEvent, once } from 'vs/base/common/event';
14+
import Event, { Emitter, anyEvent as anyEvent, filterEvent, once } from 'vs/base/common/event';
1515
import * as ext from 'vs/workbench/common/contributions';
1616
import { CodeEditor } from 'vs/editor/browser/codeEditor';
1717
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';

‎src/vs/workbench/parts/scm/electron-browser/scmActivity.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { localize } from 'vs/nls';
99
import { basename } from 'vs/base/common/paths';
1010
import { IDisposable, dispose, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
11-
import { filterEvent, any as anyEvent } from 'vs/base/common/event';
11+
import { filterEvent, anyEvent as anyEvent } from 'vs/base/common/event';
1212
import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm';
1313
import { ISCMService, ISCMRepository } from 'vs/workbench/services/scm/common/scm';
1414
import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
@@ -159,4 +159,4 @@ export class StatusBarController implements IWorkbenchContribution {
159159
this.statusBarDisposable.dispose();
160160
this.disposables = dispose(this.disposables);
161161
}
162-
}
162+
}

‎src/vs/workbench/parts/search/common/searchModel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
1212
import { TPromise, PPromise } from 'vs/base/common/winjs.base';
1313
import URI from 'vs/base/common/uri';
1414
import { values, ResourceMap, TernarySearchTree } from 'vs/base/common/map';
15-
import Event, { Emitter, fromPromise, stopwatch, any } from 'vs/base/common/event';
15+
import Event, { Emitter, fromPromise, stopwatch, anyEvent } from 'vs/base/common/event';
1616
import { ISearchService, ISearchProgressItem, ISearchComplete, ISearchQuery, IPatternInfo, IFileMatch } from 'vs/platform/search/common/search';
1717
import { ReplacePattern } from 'vs/platform/search/common/replace';
1818
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -728,7 +728,7 @@ export class SearchModel extends Disposable {
728728

729729
const onDone = fromPromise(this.currentRequest);
730730
const progressEmitter = new Emitter<void>();
731-
const onFirstRender = any(onDone, progressEmitter.event);
731+
const onFirstRender = anyEvent(onDone, progressEmitter.event);
732732
const onFirstRenderStopwatch = stopwatch(onFirstRender);
733733
/* __GDPR__
734734
"searchResultsFirstRender" : {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import URI from 'vs/base/common/uri';
8-
import Event, { Emitter, debounceEvent, any } from 'vs/base/common/event';
8+
import Event, { Emitter, debounceEvent, anyEvent } from 'vs/base/common/event';
99
import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from './decorations';
1010
import { TernarySearchTree } from 'vs/base/common/map';
1111
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -317,7 +317,7 @@ export class FileDecorationsService implements IDecorationsService {
317317
private readonly _decorationStyles: DecorationStyles;
318318
private readonly _disposables: IDisposable[];
319319

320-
readonly onDidChangeDecorations: Event<IResourceDecorationChangeEvent> = any(
320+
readonly onDidChangeDecorations: Event<IResourceDecorationChangeEvent> = anyEvent(
321321
this._onDidChangeDecorations.event,
322322
debounceEvent<URI | URI[], FileDecorationChangeEvent>(
323323
this._onDidChangeDecorationsDelayed.event,

‎src/vs/workbench/services/extensions/electron-browser/extensionHost.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
2525
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
2626
import { generateRandomPipeName, Protocol } from 'vs/base/parts/ipc/node/ipc.net';
2727
import { createServer, Server, Socket } from 'net';
28-
import Event, { Emitter, debounceEvent, mapEvent, any } from 'vs/base/common/event';
28+
import Event, { Emitter, debounceEvent, mapEvent, anyEvent } from 'vs/base/common/event';
2929
import { fromEventEmitter } from 'vs/base/node/event';
3030
import { IInitData, IWorkspaceData } from 'vs/workbench/api/node/extHost.protocol';
3131
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
@@ -171,7 +171,7 @@ export class ExtensionHostProcessWorker {
171171
this._extensionHostProcess.stderr.setEncoding('utf8');
172172
const onStdout = fromEventEmitter<string>(this._extensionHostProcess.stdout, 'data');
173173
const onStderr = fromEventEmitter<string>(this._extensionHostProcess.stderr, 'data');
174-
const onOutput = any(
174+
const onOutput = anyEvent(
175175
mapEvent(onStdout, o => ({ data: `%c${o}`, format: [''] })),
176176
mapEvent(onStderr, o => ({ data: `%c${o}`, format: ['color: red'] }))
177177
);

0 commit comments

Comments
 (0)