debt - remove obsolete use of EventSource

src/vs/workbench/browser/actionRegistry.ts

@@ -10,7 +10,6 @@ import collections = require('vs/base/common/collections');
 import {Registry} from 'vs/platform/platform';
 import {IAction} from 'vs/base/common/actions';
 import {EventProvider} from 'vs/base/common/eventProvider';
-import {EventSource} from 'vs/base/common/eventSource';
 import {KeybindingsRegistry,ICommandDescriptor} from 'vs/platform/keybinding/common/keybindingsRegistry';
 import {KeybindingsUtils} from 'vs/platform/keybinding/common/keybindingsUtils';
 import {IPartService} from 'vs/workbench/services/part/common/partService';
@@ -57,41 +56,21 @@ export interface IWorkbenchActionRegistry {
 	 * Returns the category for the given action or null iff none.
 	 */
 	getCategory(actionId: string): string;
-
-	/**
-	 * Eventing for workbench actions.
-	 */
-	onRegisterWorkbenchAction: EventProvider<(descriptor: SyncActionDescriptor) => void>;
-	onUnregisterWorkbenchAction: EventProvider<(descriptor: SyncActionDescriptor) => void>;
 }
 
 class WorkbenchActionRegistry implements IWorkbenchActionRegistry {
 	private workbenchActions: collections.IStringDictionary<SyncActionDescriptor>;
-	private onActionUnregister: EventSource<(descriptor: SyncActionDescriptor) => void>;
-	private onActionRegister: EventSource<(descriptor: SyncActionDescriptor) => void>;
 	private mapActionIdToCategory: { [id: string]: string; };
 
 	constructor() {
 		this.workbenchActions = Object.create(null);
 		this.mapActionIdToCategory = Object.create(null);
-
-		this.onActionRegister = new EventSource<(descriptor: SyncActionDescriptor) => void>();
-		this.onActionUnregister = new EventSource<(descriptor: SyncActionDescriptor) => void>();
-	}
-
-	private fireActionRegister(descriptor: SyncActionDescriptor): void {
-		this.onActionRegister.fire(descriptor);
-	}
-
-	private fireActionUnregister(descriptor: SyncActionDescriptor): void {
-		this.onActionUnregister.fire(descriptor);
 	}
 
 	public registerWorkbenchAction(descriptor: SyncActionDescriptor, category?: string): void {
 		if (!this.workbenchActions[descriptor.id]) {
 			this.workbenchActions[descriptor.id] = descriptor;
 			registerWorkbenchCommandFromAction(descriptor);
-			this.fireActionRegister(descriptor);
 
 			if (category) {
 				this.mapActionIdToCategory[descriptor.id] = category;
@@ -108,8 +87,6 @@ class WorkbenchActionRegistry implements IWorkbenchActionRegistry {
 		delete this.workbenchActions[id];
 		delete this.mapActionIdToCategory[id];
 
-		this.fireActionUnregister(descriptor);
-
 		return true;
 	}
 
@@ -131,14 +108,6 @@ class WorkbenchActionRegistry implements IWorkbenchActionRegistry {
 
 		actions.forEach(action => this.registerWorkbenchAction(action), this);
 	}
-
-	public get onRegisterWorkbenchAction(): EventProvider<(descriptor: SyncActionDescriptor) => void> {
-		return this.onActionRegister.value;
-	}
-
-	public get onUnregisterWorkbenchAction(): EventProvider<(descriptor: SyncActionDescriptor) => void> {
-		return this.onActionUnregister.value;
-	}
 }
 
 Registry.add(Extensions.WorkbenchActions, new WorkbenchActionRegistry());

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

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import {Match, FileMatch, SearchResult} from 'vs/workbench/parts/search/common/searchModel';
 import model = require('vs/editor/common/model/model');
-import {EventSource} from 'vs/base/common/eventSource';
+import {Emitter} from 'vs/base/common/event';
 import {IModel} from 'vs/editor/common/editorCommon';
 import URI from 'vs/base/common/uri';
 import {create} from 'vs/platform/instantiation/common/instantiationService';
@@ -24,13 +24,13 @@ suite('Search - Model', () => {
 	let oneModel: IModel;
 
 	setup(() => {
-		let event = new EventSource<any>();
+		let emitter = new Emitter<any>();
 
 		oneModel = new model.Model('line1\nline2\nline3', null, URI.parse('file:///folder/file.txt'));
 		instantiation = create({
 			modelService: {
 				getModel: () => oneModel,
-				onModelAdded: event.value
+				onModelAdded: emitter.event
 			},
 			requestService: {
 				getRequestUrl: () => 'file:///folder/file.txt'