debt - use statusbar service for global progress message

src/vs/workbench/services/progress/browser/progressService2.ts

@@ -5,16 +5,13 @@
 'use strict';
 
 import 'vs/css!./media/progressService2';
-import * as dom from 'vs/base/browser/dom';
+
 import { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IProgressService2, IProgressOptions, IProgressStep, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
 import { IProgress, emptyProgress, Progress } from 'vs/platform/progress/common/progress';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
+import { StatusbarAlignment, IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { always, timeout } from 'vs/base/common/async';
 import { ProgressBadge, IActivityService } from 'vs/workbench/services/activity/common/activity';
@@ -23,69 +20,18 @@ import { Action } from 'vs/base/common/actions';
 import { once } from 'vs/base/common/event';
 import { ViewContainer } from 'vs/workbench/common/views';
 
-class WindowProgressItem implements IStatusbarItem {
-
-	static Instance: WindowProgressItem;
-
-	private _element: HTMLElement;
-	private _label: OcticonLabel;
-
-	constructor() {
-		WindowProgressItem.Instance = this;
-	}
-
-	render(element: HTMLElement): IDisposable {
-		this._element = element;
-		this._element.classList.add('progress');
-
-		const container = document.createElement('span');
-		this._element.appendChild(container);
-
-		const spinnerContainer = document.createElement('span');
-		spinnerContainer.classList.add('spinner-container');
-		container.appendChild(spinnerContainer);
-
-		const spinner = new OcticonLabel(spinnerContainer);
-		spinner.text = '$(sync~spin)';
-
-		const labelContainer = document.createElement('span');
-		container.appendChild(labelContainer);
-
-		this._label = new OcticonLabel(labelContainer);
-
-		this.hide();
-
-		return null;
-	}
-
-	set text(value: string) {
-		this._label.text = value;
-	}
-
-	set title(value: string) {
-		this._label.title = value;
-	}
-
-	hide() {
-		dom.hide(this._element);
-	}
-
-	show() {
-		dom.show(this._element);
-	}
-}
-
-
 export class ProgressService2 implements IProgressService2 {
 
 	_serviceBrand: any;
 
-	private _stack: [IProgressOptions, Progress<IProgressStep>][] = [];
+	private readonly _stack: [IProgressOptions, Progress<IProgressStep>][] = [];
+	private _globalStatusEntry: IDisposable;
 
 	constructor(
 		@IActivityService private readonly _activityBar: IActivityService,
 		@IViewletService private readonly _viewletService: IViewletService,
-		@INotificationService private readonly _notificationService: INotificationService
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IStatusbarService private readonly _statusbarService: IStatusbarService,
 	) {
 		//
 	}
@@ -148,9 +94,11 @@ export class ProgressService2 implements IProgressService2 {
 	}
 
 	private _updateWindowProgress(idx: number = 0) {
-		if (idx >= this._stack.length) {
-			WindowProgressItem.Instance.hide();
-		} else {
+
+		dispose(this._globalStatusEntry);
+
+		if (idx < this._stack.length) {
+
 			const [options, progress] = this._stack[idx];
 
 			let progressTitle = options.title;
@@ -179,9 +127,10 @@ export class ProgressService2 implements IProgressService2 {
 				return;
 			}
 
-			WindowProgressItem.Instance.text = text;
-			WindowProgressItem.Instance.title = title;
-			WindowProgressItem.Instance.show();
+			this._globalStatusEntry = this._statusbarService.addEntry({
+				text: `$(sync~spin) ${text}`,
+				tooltip: title
+			}, StatusbarAlignment.LEFT);
 		}
 	}
 
@@ -325,8 +274,3 @@ export class ProgressService2 implements IProgressService2 {
 		return promise;
 	}
 }
-
-
-Registry.as<IStatusbarRegistry>(Extensions.Statusbar).registerStatusbarItem(
-	new StatusbarItemDescriptor(WindowProgressItem, StatusbarAlignment.LEFT)
-);