Merge from master

src/sql/parts/taskHistory/viewlet/taskHistoryActionProvider.ts

@@ -30,18 +30,18 @@ export class TaskHistoryActionProvider extends ContributableActionProvider {
 	/**
 	 * Return actions given an element in the tree
 	 */
-	public getActions(tree: ITree, element: any): TPromise<IAction[]> {
+	public getActions(tree: ITree, element: any): IAction[] {
 		if (element instanceof TaskNode) {
-			return TPromise.as(this.getTaskHistoryActions(tree, element));
+			return this.getTaskHistoryActions(tree, element);
 		}
-		return TPromise.as([]);
+		return [];
 	}
 
 	public hasSecondaryActions(tree: ITree, element: any): boolean {
 		return false;
 	}
 
-	public getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
+	public getSecondaryActions(tree: ITree, element: any): IAction[] {
 		return super.getSecondaryActions(tree, element);
 	}
 

src/sql/parts/taskHistory/viewlet/taskHistoryView.ts

@@ -8,7 +8,7 @@ import errors = require('vs/base/common/errors');
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import Severity from 'vs/base/common/severity';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
-import * as builder from 'vs/base/browser/builder';
+import * as builder from 'sql/base/browser/builder';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { ITree } from 'vs/base/parts/tree/browser/tree';

src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts

@@ -20,6 +20,8 @@ import { TaskHistoryView } from 'sql/parts/taskHistory/viewlet/taskHistoryView';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export const VIEWLET_ID = 'workbench.view.taskHistory';
 
@@ -32,13 +34,13 @@ export class TaskHistoryViewlet extends Viewlet {
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
-		@IConnectionManagementService private connectionManagementService: IConnectionManagementService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IViewletService private viewletService: IViewletService,
 		@INotificationService private _notificationService: INotificationService,
-		@IPartService partService: IPartService
+		@IPartService partService: IPartService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IStorageService storageService: IStorageService
 	) {
-		super(VIEWLET_ID, partService, telemetryService, themeService);
+		super(VIEWLET_ID, configurationService, partService, telemetryService, themeService, storageService);
 	}
 
 	private onError(err: any): void {
@@ -60,10 +62,9 @@ export class TaskHistoryViewlet extends Viewlet {
 		return TPromise.as(null);
 	}
 
-	public setVisible(visible: boolean): TPromise<void> {
-		return super.setVisible(visible).then(() => {
-			this._taskHistoryView.setVisible(visible);
-		});
+	public setVisible(visible: boolean): void {
+		super.setVisible(visible);
+		this._taskHistoryView.setVisible(visible);
 	}
 
 	public focus(): void {