Merge from master

src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css

@@ -9,7 +9,6 @@
 	width: 100%;
 	height: 22px;
 	font-size: 12px;
-	padding: 0 10px;
 }
 
 .monaco-workbench > .part.statusbar > .statusbar-item {
@@ -46,6 +45,15 @@
 	margin-left: 5px;
 }
 
+/* adding padding to the most left status bar item */
+.monaco-workbench > .part.statusbar > .statusbar-item.left:first-child, .monaco-workbench > .part.statusbar > .statusbar-item.right + .statusbar-item.left {
+	padding-left: 10px;
+}
+/* adding padding to the most right status bar item */
+.monaco-workbench > .part.statusbar > .statusbar-item.right:first-child {
+	padding-right: 10px;
+}
+
 .monaco-workbench > .part.statusbar > .statusbar-item a {
 	cursor: pointer;
 	display: inline-block;

src/vs/workbench/browser/parts/statusbar/statusbar.ts

@@ -2,11 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import * as statusbarService from 'vs/platform/statusbar/common/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { SyncDescriptor0, createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
 
@@ -14,8 +13,6 @@ export interface IStatusbarItem {
 	render(element: HTMLElement): IDisposable;
 }
 
-export import StatusbarAlignment = statusbarService.StatusbarAlignment;
-
 export class StatusbarItemDescriptor {
 	syncDescriptor: SyncDescriptor0<IStatusbarItem>;
 	alignment: StatusbarAlignment;

src/vs/workbench/browser/parts/statusbar/statusbarPart.ts

@@ -3,23 +3,19 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import 'vs/css!./media/statusbarpart';
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { $ } from 'vs/base/browser/builder';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Part } from 'vs/workbench/browser/part';
-import { StatusbarAlignment, IStatusbarRegistry, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarRegistry, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStatusbarService, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { Action } from 'vs/base/common/actions';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
@@ -28,15 +24,16 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { isThemeColor } from 'vs/editor/common/editorCommon';
 import { Color } from 'vs/base/common/color';
-import { addClass, EventHelper, createStyleSheet } from 'vs/base/browser/dom';
+import { addClass, EventHelper, createStyleSheet, addDisposableListener } from 'vs/base/browser/dom';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export class StatusbarPart extends Part implements IStatusbarService {
 
 	_serviceBrand: any;
 
-	private static readonly PRIORITY_PROP = 'priority';
-	private static readonly ALIGNMENT_PROP = 'alignment';
+	private static readonly PRIORITY_PROP = 'statusbar-entry-priority';
+	private static readonly ALIGNMENT_PROP = 'statusbar-entry-alignment';
 
 	private statusItemsContainer: HTMLElement;
 	private statusMsgDispose: IDisposable;
@@ -47,9 +44,10 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		id: string,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService
+		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@IStorageService storageService: IStorageService
 	) {
-		super(id, { hasTitle: false }, themeService);
+		super(id, { hasTitle: false }, themeService, storageService);
 
 		this.registerListeners();
 	}
@@ -71,7 +69,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		let inserted = false;
 		for (let i = 0; i < neighbours.length; i++) {
 			const neighbour = neighbours[i];
-			const nPriority = $(neighbour).getProperty(StatusbarPart.PRIORITY_PROP);
+			const nPriority = Number(neighbour.getAttribute(StatusbarPart.PRIORITY_PROP));
 			if (
 				alignment === StatusbarAlignment.LEFT && nPriority < priority ||
 				alignment === StatusbarAlignment.RIGHT && nPriority > priority
@@ -87,7 +85,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		}
 
 		return toDisposable(() => {
-			$(el).destroy();
+			el.remove();
 
 			if (toDispose) {
 				toDispose.dispose();
@@ -102,7 +100,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		const children = container.children;
 		for (let i = 0; i < children.length; i++) {
 			const childElement = <HTMLElement>children.item(i);
-			if ($(childElement).getProperty(StatusbarPart.ALIGNMENT_PROP) === alignment) {
+			if (Number(childElement.getAttribute(StatusbarPart.ALIGNMENT_PROP)) === alignment) {
 				entries.push(childElement);
 			}
 		}
@@ -116,17 +114,29 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		// Fill in initial items that were contributed from the registry
 		const registry = Registry.as<IStatusbarRegistry>(Extensions.Statusbar);
 
-		const leftDescriptors = registry.items.filter(d => d.alignment === StatusbarAlignment.LEFT).sort((a, b) => b.priority - a.priority);
-		const rightDescriptors = registry.items.filter(d => d.alignment === StatusbarAlignment.RIGHT).sort((a, b) => a.priority - b.priority);
+		const descriptors = registry.items.slice().sort((a, b) => {
+			if (a.alignment === b.alignment) {
+				if (a.alignment === StatusbarAlignment.LEFT) {
+					return b.priority - a.priority;
+				} else {
+					return a.priority - b.priority;
+				}
+			} else if (a.alignment === StatusbarAlignment.LEFT) {
+				return 1;
+			} else if (a.alignment === StatusbarAlignment.RIGHT) {
+				return -1;
+			} else {
+				return 0;
+			}
+		});
 
-		const descriptors = rightDescriptors.concat(leftDescriptors); // right first because they float
-		descriptors.forEach(descriptor => {
+		for (const descriptor of descriptors) {
 			const item = this.instantiationService.createInstance(descriptor.syncDescriptor);
 			const el = this.doCreateStatusItem(descriptor.alignment, descriptor.priority);
 
 			this._register(item.render(el));
 			this.statusItemsContainer.appendChild(el);
-		});
+		}
 
 		return this.statusItemsContainer;
 	}
@@ -134,22 +144,22 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	protected updateStyles(): void {
 		super.updateStyles();
 
-		const container = $(this.getContainer());
+		const container = this.getContainer();
 
 		// Background colors
 		const backgroundColor = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BACKGROUND : STATUS_BAR_NO_FOLDER_BACKGROUND);
-		container.style('background-color', backgroundColor);
-		container.style('color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
+		container.style.backgroundColor = backgroundColor;
+		container.style.color = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND);
 
 		// Border color
 		const borderColor = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BORDER : STATUS_BAR_NO_FOLDER_BORDER) || this.getColor(contrastBorder);
-		container.style('border-top-width', borderColor ? '1px' : null);
-		container.style('border-top-style', borderColor ? 'solid' : null);
-		container.style('border-top-color', borderColor);
+		container.style.borderTopWidth = borderColor ? '1px' : null;
+		container.style.borderTopStyle = borderColor ? 'solid' : null;
+		container.style.borderTopColor = borderColor;
 
 		// Notification Beak
 		if (!this.styleElement) {
-			this.styleElement = createStyleSheet(container.getHTMLElement());
+			this.styleElement = createStyleSheet(container);
 		}
 
 		this.styleElement.innerHTML = `.monaco-workbench > .part.statusbar > .statusbar-item.has-beak:before { border-bottom-color: ${backgroundColor}; }`;
@@ -168,8 +178,8 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			addClass(el, 'left');
 		}
 
-		$(el).setProperty(StatusbarPart.PRIORITY_PROP, priority);
-		$(el).setProperty(StatusbarPart.ALIGNMENT_PROP, alignment);
+		el.setAttribute(StatusbarPart.PRIORITY_PROP, String(priority));
+		el.setAttribute(StatusbarPart.ALIGNMENT_PROP, String(alignment));
 
 		return el;
 	}
@@ -185,7 +195,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			statusDispose = this.addEntry({ text: message }, StatusbarAlignment.LEFT, -Number.MAX_VALUE /* far right on left hand side */);
 			showHandle = null;
 		}, delayBy);
-		let hideHandle: number;
+		let hideHandle: any;
 
 		// Dispose function takes care of timeouts and actual entry
 		const dispose = {
@@ -242,7 +252,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 		if (this.entry.command) {
 			textContainer = document.createElement('a');
 
-			$(textContainer).on('click', () => this.executeCommand(this.entry.command, this.entry.arguments), toDispose);
+			toDispose.push(addDisposableListener(textContainer, 'click', () => this.executeCommand(this.entry.command, this.entry.arguments)));
 		} else {
 			textContainer = document.createElement('span');
 		}
@@ -252,7 +262,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 
 		// Tooltip
 		if (this.entry.tooltip) {
-			$(textContainer).title(this.entry.tooltip);
+			textContainer.title = this.entry.tooltip;
 		}
 
 		// Color
@@ -263,23 +273,23 @@ class StatusBarEntryItem implements IStatusbarItem {
 				color = (this.themeService.getTheme().getColor(colorId) || Color.transparent).toString();
 				toDispose.push(this.themeService.onThemeChange(theme => {
 					let colorValue = (this.themeService.getTheme().getColor(colorId) || Color.transparent).toString();
-					$(textContainer).color(colorValue);
+					textContainer.style.color = colorValue;
 				}));
 			}
-			$(textContainer).color(color);
+			textContainer.style.color = color;
 		}
 
 		// Context Menu
 		if (this.entry.extensionId) {
-			$(textContainer).on('contextmenu', e => {
+			toDispose.push(addDisposableListener(textContainer, 'contextmenu', e => {
 				EventHelper.stop(e, true);
 
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => el,
 					getActionsContext: () => this.entry.extensionId,
-					getActions: () => TPromise.as([manageExtensionAction])
+					getActions: () => [manageExtensionAction]
 				});
-			}, toDispose);
+			}));
 		}
 
 		el.appendChild(textContainer);
@@ -307,7 +317,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 			}
 		*/
 		this.telemetryService.publicLog('workbenchActionExecuted', { id, from: 'status bar' });
-		this.commandService.executeCommand(id, ...args).done(undefined, err => this.notificationService.error(toErrorMessage(err)));
+		this.commandService.executeCommand(id, ...args).then(undefined, err => this.notificationService.error(toErrorMessage(err)));
 	}
 }
 
@@ -319,7 +329,7 @@ class ManageExtensionAction extends Action {
 		super('statusbar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
 	}
 
-	run(extensionId: string): TPromise<any> {
+	run(extensionId: string): Thenable<any> {
 		return this.commandService.executeCommand('_extensions.manage', extensionId);
 	}
 }