Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

src/sql/workbench/api/browser/extensionHost.contribution.common.ts

@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './mainThreadAccountManagement';
+import './mainThreadBackgroundTaskManagement';
+import './mainThreadConnectionManagement';
+import './mainThreadCredentialManagement';
+import './mainThreadDashboard';
+import './mainThreadDashboardWebview';
+import './mainThreadDataProtocol';
+import './mainThreadExtensionManagement';
+import './mainThreadModalDialog';
+import './mainThreadModelView';
+import './mainThreadModelViewDialog';
+import './mainThreadNotebook';
+import './mainThreadNotebookDocumentsAndEditors';
+import './mainThreadObjectExplorer';
+import './mainThreadQueryEditor';
+import './mainThreadResourceProvider';
+import './mainThreadSerializationProvider';
+import './mainThreadTasks';

src/sql/workbench/api/browser/mainThreadExtensionManagement.ts

@@ -7,7 +7,7 @@ import { SqlMainContext, MainThreadExtensionManagementShape } from 'sql/workbenc
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { URI } from 'vs/base/common/uri';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadExtensionManagement)
@@ -27,6 +27,6 @@ export class MainThreadExtensionManagement implements MainThreadExtensionManagem
 	}
 
 	public $install(vsixPath: string): Thenable<string> {
-		return this._extensionService.install(URI.file(vsixPath)).then((value: IExtensionIdentifier) => { return undefined; }, (reason: any) => { return reason ? reason.toString() : undefined; });
+		return this._extensionService.install(URI.file(vsixPath)).then((value: ILocalExtension) => { return undefined; }, (reason: any) => { return reason ? reason.toString() : undefined; });
 	}
 }

src/sql/workbench/api/electron-browser/extensionHost.contribution.ts

@@ -3,4 +3,4 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'sql/workbench/api/electron-browser/mainThreadModalDialog';
+import '../browser/extensionHost.contribution.common';

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

@@ -160,8 +160,8 @@ export class ExtHostTreeView<T> extends vsTreeExt.ExtHostTreeView<T> {
 			});
 	}
 
-	protected createTreeItem(element: T, extensionTreeItem: azdata.TreeComponentItem, parent?: vsTreeExt.TreeNode): ITreeComponentItem {
-		let item = super.createTreeItem(element, extensionTreeItem, parent);
+	protected createTreeNode(element: T, extensionTreeItem: azdata.TreeComponentItem, parent?: vsTreeExt.TreeNode): vsTreeExt.TreeNode {
+		let item = super.createTreeNode(element, extensionTreeItem, parent);
 		item = Object.assign({}, item, { checked: extensionTreeItem.checked, enabled: extensionTreeItem.enabled });
 		return item;
 	}

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

@@ -40,8 +40,7 @@ import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
 import { ExtHostConfiguration, ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
 import { ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { ISchemeTransformer } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import { AzureResource } from 'sql/platform/accounts/common/interfaces';
+import { IURITransformer } from 'vs/base/common/uriIpc';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
 export interface ISqlExtensionApiFactory {
@@ -61,10 +60,9 @@ export function createApiFactory(
 	extensionService: ExtHostExtensionService,
 	logService: ExtHostLogService,
 	extHostStorage: ExtHostStorage,
-	schemeTransformer: ISchemeTransformer | null,
-	outputChannelName: string
+	uriTransformer: IURITransformer | null
 ): ISqlExtensionApiFactory {
-	let vsCodeFactory = extHostApi.createApiFactory(initData, rpcProtocol, extHostWorkspace, extHostConfiguration, extensionService, logService, extHostStorage, schemeTransformer, outputChannelName);
+	let vsCodeFactory = extHostApi.createApiFactory(initData, rpcProtocol, extHostWorkspace, extHostConfiguration, extensionService, logService, extHostStorage, uriTransformer);
 
 	// Addressable instances
 	const extHostAccountManagement = rpcProtocol.set(SqlExtHostContext.ExtHostAccountManagement, new ExtHostAccountManagement(rpcProtocol));

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

@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-
-// --- SQL contributions
-import 'sql/workbench/api/node/mainThreadConnectionManagement';
-import 'sql/workbench/api/node/mainThreadCredentialManagement';
-import 'sql/workbench/api/node/mainThreadDataProtocol';
-import 'sql/workbench/api/node/mainThreadObjectExplorer';
-import 'sql/workbench/api/node/mainThreadBackgroundTaskManagement';
-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 'sql/workbench/api/node/mainThreadQueryEditor';
-import 'sql/workbench/api/node/mainThreadModelView';
-import 'sql/workbench/api/node/mainThreadModelViewDialog';
-import 'sql/workbench/api/node/mainThreadNotebook';
-import 'sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors';
-import 'sql/workbench/api/node/mainThreadAccountManagement';
-import 'sql/workbench/api/node/mainThreadExtensionManagement';
-import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-
-export class SqlExtHostContribution implements IWorkbenchContribution {
-
-	constructor(
-		@IInstantiationService private instantiationService: IInstantiationService
-	) {
-	}
-
-	public getId(): string {
-		return 'sql.api.sqlExtHost';
-	}
-}
-
-// Register File Tracker
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(
-	SqlExtHostContribution,
-	LifecyclePhase.Restored
-);