inline ScopedService into its only user

dstorey · Jan 11, 2016 · f1971c4 · f1971c4
1 parent ff48078
commit f1971c4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 57 deletions.
diff --git a/src/vs/workbench/common/services.ts b/src/vs/workbench/common/services.ts
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -7,7 +7,7 @@
 import {TPromise} from 'vs/base/common/winjs.base';
 import types = require('vs/base/common/types');
 import {ProgressBar} from 'vs/base/browser/ui/progressbar/progressbar';
-import {ScopedService} from 'vs/workbench/common/services';
+import {EditorEvent, EventType, ViewletEvent} from 'vs/workbench/common/events';
 import {IEventService} from 'vs/platform/event/common/event';
 import {IProgressService, IProgressRunner} from 'vs/platform/progress/common/progress';
 
@@ -19,6 +19,52 @@ interface ProgressState {
 	whilePromise?: TPromise<any>;
 }
 
+export abstract class ScopedService {
+	private _eventService: IEventService;
+	private scopeId: string;
+
+	constructor(eventService: IEventService, scopeId: string) {
+		this._eventService = eventService;
+		this.scopeId = scopeId;
+
+		this.registerListeners();
+	}
+
+	public get eventService(): IEventService {
+		return this._eventService;
+	}
+
+	public registerListeners(): void {
+		this.eventService.addListener(EventType.EDITOR_CLOSED, (e: EditorEvent) => {
+			if (e.editorId === this.scopeId) {
+				this.onScopeDeactivated();
+			}
+		});
+
+		this.eventService.addListener(EventType.EDITOR_OPENED, (e: EditorEvent) => {
+			if (e.editorId === this.scopeId) {
+				this.onScopeActivated();
+			}
+		});
+
+		this.eventService.addListener(EventType.VIEWLET_CLOSED, (e: ViewletEvent) => {
+			if (e.viewletId === this.scopeId) {
+				this.onScopeDeactivated();
+			}
+		});
+
+		this.eventService.addListener(EventType.VIEWLET_OPENED, (e: ViewletEvent) => {
+			if (e.viewletId === this.scopeId) {
+				this.onScopeActivated();
+			}
+		});
+	}
+
+	public abstract onScopeActivated(): void;
+
+	public abstract onScopeDeactivated(): void;
+}
+
 export class WorkbenchProgressService extends ScopedService implements IProgressService {
 	public serviceId = IProgressService;
 	private isActive: boolean;

diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts
@@ -23,8 +23,7 @@ import {EventType} from 'vs/workbench/common/events';
 import {MainTelemetryService} from 'vs/platform/telemetry/browser/mainTelemetryService';
 import Severity from 'vs/base/common/severity';
 import {UntitledEditorService} from 'vs/workbench/services/untitled/browser/untitledEditorService';
-import {WorkbenchProgressService} from 'vs/workbench/services/progress/browser/progressService';
-import {ScopedService} from 'vs/workbench/common/services';
+import {WorkbenchProgressService, ScopedService} from 'vs/workbench/services/progress/browser/progressService';
 import {EditorArrangement} from 'vs/workbench/services/editor/common/editorService';
 import {DelegatingWorkbenchEditorService, WorkbenchEditorService, IEditorPart} from 'vs/workbench/services/editor/browser/editorService';
 import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService';