Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421 (#7404)

* Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421

* readd svgs

src/vs/workbench/api/browser/mainThreadCodeInsets.ts

@@ -90,11 +90,11 @@ export class MainThreadEditorInsets implements MainThreadEditorInsetsShape {
 
 		const webview = this._webviewService.createWebview('' + handle, {
 			enableFindWidget: false,
-			extension: { id: extensionId, location: URI.revive(extensionLocation) }
 		}, {
 			allowScripts: options.enableScripts,
 			localResourceRoots: options.localResourceRoots ? options.localResourceRoots.map(uri => URI.revive(uri)) : undefined
 		});
+		webview.extension = { id: extensionId, location: URI.revive(extensionLocation) };
 
 		const webviewZone = new EditorWebviewZone(editor, line, height, webview);
 

src/vs/workbench/api/browser/mainThreadCommands.ts

@@ -58,7 +58,7 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 			id,
 			CommandsRegistry.registerCommand(id, (accessor, ...args) => {
 				return this._proxy.$executeContributedCommand(id, ...args).then(result => {
-					return revive(result, 0);
+					return revive(result);
 				});
 			})
 		);
@@ -74,7 +74,7 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 
 	async $executeCommand<T>(id: string, args: any[], retry: boolean): Promise<T | undefined> {
 		for (let i = 0; i < args.length; i++) {
-			args[i] = revive(args[i], 0);
+			args[i] = revive(args[i]);
 		}
 		if (retry && args.length > 0 && !CommandsRegistry.getCommand(id)) {
 			await this._extensionService.activateByEvent(`onCommand:${id}`);

src/vs/workbench/api/browser/mainThreadFileSystem.ts

@@ -123,10 +123,10 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape {
 
 class RemoteFileSystemProvider implements IFileSystemProvider {
 
-	private readonly _onDidChange = new Emitter<IFileChange[]>();
+	private readonly _onDidChange = new Emitter<readonly IFileChange[]>();
 	private readonly _registration: IDisposable;
 
-	readonly onDidChangeFile: Event<IFileChange[]> = this._onDidChange.event;
+	readonly onDidChangeFile: Event<readonly IFileChange[]> = this._onDidChange.event;
 
 	readonly capabilities: FileSystemProviderCapabilities;
 	readonly onDidChangeCapabilities: Event<void> = Event.None;

src/vs/workbench/api/browser/mainThreadKeytar.ts

@@ -5,7 +5,7 @@
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { MainContext, MainThreadKeytarShape, IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
+import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
 
 @extHostNamedCustomer(MainContext.MainThreadKeytar)
 export class MainThreadKeytar implements MainThreadKeytarShape {

src/vs/workbench/api/browser/mainThreadStatusBar.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
+import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/workbench/services/statusbar/common/statusbar';
 import { MainThreadStatusBarShape, MainContext, IExtHostContext } from '../common/extHost.protocol';
 import { ThemeColor } from 'vs/platform/theme/common/themeService';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';

src/vs/workbench/api/browser/mainThreadWebview.ts

@@ -8,7 +8,6 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { isWeb } from 'vs/base/common/platform';
 import { startsWith } from 'vs/base/common/strings';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { generateUuid } from 'vs/base/common/uuid';
 import * as modes from 'vs/editor/common/modes';
 import { localize } from 'vs/nls';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
@@ -151,7 +150,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		webview.setName(value);
 	}
 
-	public $setState(handle: WebviewPanelHandle, state: modes.WebviewEditorState): void {
+	public $setState(handle: WebviewPanelHandle, state: modes.WebviewContentState): void {
 		const webview = this.getWebviewEditorInput(handle);
 		if (webview instanceof CustomFileEditorInput) {
 			webview.setState(state);
@@ -173,6 +172,11 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		webview.webview.contentOptions = reviveWebviewOptions(options as any /*todo@mat */);
 	}
 
+	public $setExtension(handle: WebviewPanelHandle, extensionId: ExtensionIdentifier, extensionLocation: UriComponents): void {
+		const webview = this.getWebviewEditorInput(handle);
+		webview.webview.extension = { id: extensionId, location: URI.revive(extensionLocation) };
+	}
+
 	public $reveal(handle: WebviewPanelHandle, showOptions: WebviewPanelShowOptions): void {
 		const webview = this.getWebviewEditorInput(handle);
 		if (webview.isDisposed()) {
@@ -250,7 +254,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 				return webviewEditorInput.getTypeId() !== WebviewInput.typeId && webviewEditorInput.viewType === viewType;
 			},
 			resolveWebview: async (webview) => {
-				const handle = generateUuid();
+				const handle = webview.id;
 				this._webviewEditorInputs.add(handle, webview);
 				this.hookupWebviewEventDelegate(handle, webview);
 

src/vs/workbench/api/browser/mainThreadWindow.ts

@@ -7,9 +7,9 @@ import { Event } from 'vs/base/common/event';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWindowService } from 'vs/platform/windows/common/windows';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { ExtHostContext, ExtHostWindowShape, IExtHostContext, IOpenUriOptions, MainContext, MainThreadWindowShape } from '../common/extHost.protocol';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
 
 @extHostNamedCustomer(MainContext.MainThreadWindow)
 export class MainThreadWindow implements MainThreadWindowShape {
@@ -20,12 +20,12 @@ export class MainThreadWindow implements MainThreadWindowShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IWindowService private readonly windowService: IWindowService,
+		@IHostService private readonly hostService: IHostService,
 		@IOpenerService private readonly openerService: IOpenerService,
 	) {
 		this.proxy = extHostContext.getProxy(ExtHostContext.ExtHostWindow);
 
-		Event.latch(windowService.onDidChangeFocus)
+		Event.latch(hostService.onDidChangeFocus)
 			(this.proxy.$onDidChangeWindowFocus, this.proxy, this.disposables);
 	}
 
@@ -39,7 +39,7 @@ export class MainThreadWindow implements MainThreadWindowShape {
 	}
 
 	$getWindowVisibility(): Promise<boolean> {
-		return this.windowService.isFocused();
+		return Promise.resolve(this.hostService.hasFocus);
 	}
 
 	async $openUri(uriComponents: UriComponents, options: IOpenUriOptions): Promise<boolean> {

src/vs/workbench/api/browser/viewsExtensionPoint.ts

@@ -83,7 +83,7 @@ interface IUserFriendlyViewDescriptor {
 
 	// From 'remoteViewDescriptor' type
 	group?: string;
-	remoteAuthority?: string;
+	remoteName?: string | string[];
 }
 
 const viewDescriptor: IJSONSchema = {
@@ -123,9 +123,12 @@ const remoteViewDescriptor: IJSONSchema = {
 			description: localize('vscode.extension.contributes.view.group', 'Nested group in the viewlet'),
 			type: 'string'
 		},
-		remoteAuthority: {
-			description: localize('vscode.extension.contributes.view.remoteAuthority', 'The remote authority associated with this view'),
-			type: 'string'
+		remoteName: {
+			description: localize('vscode.extension.contributes.view.remoteName', 'The name of the remote type associated with this view'),
+			type: ['string', 'array'],
+			items: {
+				type: 'string'
+			}
 		}
 	}
 };
@@ -435,7 +438,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 						extensionId: extension.description.identifier,
 						originalContainerId: entry.key,
 						group: item.group,
-						remoteAuthority: item.remoteAuthority
+						remoteAuthority: item.remoteName || (<any>item).remoteAuthority // TODO@roblou - delete after remote extensions are updated
 					};
 
 					viewIds.push(viewDescriptor.id);