Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.

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

@@ -1,23 +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 './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/electron-browser/sqlExtensionHost.contribution.ts

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

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

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

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

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  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
+);