From b2ff724dcb5d1624bff35cc430646983527135ac Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 18 Jun 2019 16:28:08 +0200
Subject: [PATCH] web - api :lipstick:

---
 src/vs/code/browser/workbench/workbench.js |  5 ++---
 src/vs/workbench/browser/web.main.ts       | 14 ++++----------
 src/vs/workbench/workbench.web.api.ts      |  8 ++------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/vs/code/browser/workbench/workbench.js b/src/vs/code/browser/workbench/workbench.js
index 04d9d90279e..3dfc2e31515 100644
--- a/src/vs/code/browser/workbench/workbench.js
+++ b/src/vs/code/browser/workbench/workbench.js
@@ -21,9 +21,8 @@
 	});
 
 	// @ts-ignore
-	require(['vs/workbench/workbench.web.api'], function () {
+	require(['vs/workbench/workbench.web.api'], function (api) {
 		// @ts-ignore
-		// eslint-disable-next-line no-undef
-		monaco.workbench.create(document.body, self.WORKBENCH_WEB_CONFIGURATION);
+		api.create(document.body, self.WORKBENCH_WEB_CONFIGURATION);
 	});
 })();
\ No newline at end of file
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index b63a03279c5..d728c100011 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -97,10 +97,11 @@ class CodeRendererMain extends Disposable {
 		const remoteAuthorityResolverService = new RemoteAuthorityResolverService();
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
-		// Sign
+		// Signing
 		const signService = new SignService();
 		serviceCollection.set(ISignService, signService);
 
+		// Remote Agent
 		const remoteAgentService = this._register(new RemoteAgentService(environmentService, productService, remoteAuthorityResolverService, signService));
 		serviceCollection.set(IRemoteAgentService, remoteAgentService);
 
@@ -112,6 +113,7 @@ class CodeRendererMain extends Disposable {
 		if (connection) {
 			const channel = connection.getChannel<IChannel>(REMOTE_FILE_SYSTEM_CHANNEL_NAME);
 			const remoteFileSystemProvider = this._register(new RemoteExtensionsFileSystemProvider(channel, remoteAgentService.getEnvironment()));
+
 			fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
 		}
 
@@ -165,15 +167,7 @@ class CodeRendererMain extends Disposable {
 }
 
 export function main(domElement: HTMLElement, options: IWorkbenchConstructionOptions): Promise<void> {
-	const renderer = new CodeRendererMain(
-		domElement,
-		{
-			userDataUri: URI.revive(options.userDataUri),
-			remoteAuthority: options.remoteAuthority,
-			webviewEndpoint: options.webviewEndpoint,
-			folderUri: options.folderUri ? URI.revive(options.folderUri) : undefined,
-			workspaceUri: options.workspaceUri ? URI.revive(options.workspaceUri) : undefined,
-		});
+	const renderer = new CodeRendererMain(domElement, options);
 
 	return renderer.open();
 }
\ No newline at end of file
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
index 3085d6a4875..326b1f485c3 100644
--- a/src/vs/workbench/workbench.web.api.ts
+++ b/src/vs/workbench/workbench.web.api.ts
@@ -22,10 +22,6 @@ function create(domElement: HTMLElement, options: IWorkbenchConstructionOptions)
 	return main(domElement, options);
 }
 
-const api: any = self;
-
-api.monaco = {
-	workbench: {
-		create
-	}
+export {
+	create
 };
\ No newline at end of file
-- 
GitLab