integrate with contextkeyservice (#804)

* commting .d.ts changes

* added serverinfo to .d.ts

* maybe its working?

* works

* updated contrib

* remove unnecessary code

* fix compile errors

* change back sqlops engine for merge

src/sql/workbench/api/node/extHostDashboard.ts

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IThreadService } from 'vs/workbench/services/thread/common/threadService';
+import Event, { Emitter } from 'vs/base/common/event';
+
+import * as sqlops from 'sqlops';
+
+import { ExtHostDashboardShape, MainThreadDashboardShape, SqlMainContext } from './sqlExtHost.protocol';
+
+export class ExtHostDashboard implements ExtHostDashboardShape {
+	private _onDidOpenDashboard = new Emitter<sqlops.DashboardDocument>();
+	public readonly onDidOpenDashboard: Event<sqlops.DashboardDocument> = this._onDidOpenDashboard.event;
+
+	private _onDidChangeToDashboard = new Emitter<sqlops.DashboardDocument>();
+	public readonly onDidChangeToDashboard: Event<sqlops.DashboardDocument> = this._onDidChangeToDashboard.event;
+
+	private _proxy: MainThreadDashboardShape;
+
+	constructor(threadService: IThreadService) {
+		this._proxy = threadService.get(SqlMainContext.MainThreadDashboard);
+	}
+
+	$onDidOpenDashboard(dashboard: sqlops.DashboardDocument) {
+		this._onDidOpenDashboard.fire(dashboard);
+	}
+
+	$onDidChangeToDashboard(dashboard: sqlops.DashboardDocument) {
+		this._onDidChangeToDashboard.fire(dashboard);
+	}
+}

src/sql/workbench/api/node/sqlExtHost.api.impl.ts

@@ -31,6 +31,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IExtensionApiFactory } from 'vs/workbench/api/node/extHost.api.impl';
 import { ExtHostDashboardWebviews } from 'sql/workbench/api/node/extHostDashboardWebview';
 import { ExtHostConnectionManagement } from 'sql/workbench/api/node/extHostConnectionManagement';
+import { ExtHostDashboard } from 'sql/workbench/api/node/extHostDashboard';
 
 export interface ISqlExtensionApiFactory {
 	vsCodeFactory(extension: IExtensionDescription): typeof vscode;
@@ -60,6 +61,7 @@ export function createApiFactory(
 	const extHostModalDialogs = threadService.set(SqlExtHostContext.ExtHostModalDialogs, new ExtHostModalDialogs(threadService));
 	const extHostTasks = threadService.set(SqlExtHostContext.ExtHostTasks, new ExtHostTasks(threadService, logService));
 	const extHostWebviewWidgets = threadService.set(SqlExtHostContext.ExtHostDashboardWebviews, new ExtHostDashboardWebviews(threadService));
+	const extHostDashboard = threadService.set(SqlExtHostContext.ExtHostDashboard, new ExtHostDashboard(threadService));
 
 	return {
 		vsCodeFactory: vsCodeFactory,
@@ -269,6 +271,11 @@ export function createApiFactory(
 				}
 			};
 
+			const workspace: typeof sqlops.workspace = {
+				onDidOpenDashboard: extHostDashboard.onDidOpenDashboard,
+				onDidChangeToDashboard: extHostDashboard.onDidChangeToDashboard
+			};
+
 			const dashboard = {
 				registerWebviewProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void) {
 					extHostWebviewWidgets.$registerProvider(widgetId, handler);
@@ -291,7 +298,8 @@ export function createApiFactory(
 				ScriptOperation: sqlExtHostTypes.ScriptOperation,
 				window,
 				tasks,
-				dashboard
+				dashboard,
+				workspace
 			};
 		}
 	};

src/sql/workbench/api/node/sqlExtHost.contribution.ts

@@ -16,6 +16,7 @@ import 'sql/workbench/api/node/mainThreadDataProtocol';
 import 'sql/workbench/api/node/mainThreadSerializationProvider';
 import 'sql/workbench/api/node/mainThreadResourceProvider';
 import 'sql/workbench/api/electron-browser/mainThreadTasks';
+import 'sql/workbench/api/electron-browser/mainThreadDashboard';
 import 'sql/workbench/api/node/mainThreadDashboardWebview';
 import './mainThreadAccountManagement';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';

src/sql/workbench/api/node/sqlExtHost.protocol.ts

@@ -423,7 +423,8 @@ export const SqlMainContext = {
 	MainThreadResourceProvider: createMainId<MainThreadResourceProviderShape>('MainThreadResourceProvider'),
 	MainThreadModalDialog: createMainId<MainThreadModalDialogShape>('MainThreadModalDialog'),
 	MainThreadTasks: createMainId<MainThreadTasksShape>('MainThreadTasks'),
-	MainThreadDashboardWebview: createMainId<MainThreadDashboardWebviewShape>('MainThreadDashboardWebview')
+	MainThreadDashboardWebview: createMainId<MainThreadDashboardWebviewShape>('MainThreadDashboardWebview'),
+	MainThreadDashboard: createMainId<MainThreadDashboardShape>('MainThreadDashboard')
 };
 
 export const SqlExtHostContext = {
@@ -435,9 +436,19 @@ export const SqlExtHostContext = {
 	ExtHostResourceProvider: createExtId<ExtHostResourceProviderShape>('ExtHostResourceProvider'),
 	ExtHostModalDialogs: createExtId<ExtHostModalDialogsShape>('ExtHostModalDialogs'),
 	ExtHostTasks: createExtId<ExtHostTasksShape>('ExtHostTasks'),
-	ExtHostDashboardWebviews: createExtId<ExtHostDashboardWebviewsShape>('ExtHostDashboardWebviews')
+	ExtHostDashboardWebviews: createExtId<ExtHostDashboardWebviewsShape>('ExtHostDashboardWebviews'),
+	ExtHostDashboard: createExtId<ExtHostDashboardShape>('ExtHostDashboard')
 };
 
+export interface MainThreadDashboardShape extends IDisposable {
+
+}
+
+export interface ExtHostDashboardShape {
+	$onDidOpenDashboard(dashboard: sqlops.DashboardDocument): void;
+	$onDidChangeToDashboard(dashboard: sqlops.DashboardDocument): void;
+}
+
 export interface MainThreadModalDialogShape extends IDisposable {
 	$createDialog(handle: number): void;
 	$disposeDialog(handle: number): void;