Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 (#8649)

* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781

* distro

* fix tests

src/vs/workbench/api/browser/extensionHost.contribution.ts

@@ -56,6 +56,7 @@ import './mainThreadWorkspace';
 import './mainThreadComments';
 // import './mainThreadTask'; {{SQL CARBON EDIT}} @anthonydresser comment out task
 import './mainThreadLabelService';
+import './mainThreadTunnelService';
 import 'vs/workbench/api/common/apiCommands';
 
 export class ExtensionPoints implements IWorkbenchContribution {

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

@@ -33,7 +33,7 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 		this._activeOwners.clear();
 	}
 
-	private _forwardMarkers(resources: URI[]): void {
+	private _forwardMarkers(resources: readonly URI[]): void {
 		const data: [UriComponents, IMarkerData[]][] = [];
 		for (const resource of resources) {
 			data.push([

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

@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IOutputService, IOutputChannel, OUTPUT_PANEL_ID, Extensions, IOutputChannelRegistry } from 'vs/workbench/contrib/output/common/output';
+import { IOutputService, IOutputChannel, OUTPUT_PANEL_ID } from 'vs/workbench/contrib/output/common/output';
+import { Extensions, IOutputChannelRegistry } from 'vs/workbench/services/output/common/output';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { MainThreadOutputServiceShape, MainContext, IExtHostContext, ExtHostOutputServiceShape, ExtHostContext } from '../common/extHost.protocol';

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

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { MainThreadTunnelServiceShape, IExtHostContext, MainContext, ExtHostContext, ExtHostTunnelServiceShape } from 'vs/workbench/api/common/extHost.protocol';
+import { TunnelOptions, TunnelDto } from 'vs/workbench/api/common/extHostTunnelService';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
+
+@extHostNamedCustomer(MainContext.MainThreadTunnelService)
+export class MainThreadTunnelService implements MainThreadTunnelServiceShape {
+	// @ts-ignore
+	private readonly _proxy: ExtHostTunnelServiceShape;
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService
+	) {
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTunnelService);
+	}
+
+	async $openTunnel(tunnelOptions: TunnelOptions): Promise<TunnelDto | undefined> {
+		const tunnel = await this.remoteExplorerService.forward(tunnelOptions.remote.port, tunnelOptions.localPort, tunnelOptions.name);
+		if (tunnel) {
+			return { remote: { host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, localAddress: tunnel.localAddress };
+		}
+		return undefined;
+	}
+
+	async $closeTunnel(remotePort: number): Promise<void> {
+		return this.remoteExplorerService.close(remotePort);
+	}
+
+	$addDetected(tunnels: { remote: { port: number, host: string }, localAddress: string }[]): Promise<void> {
+		return Promise.resolve(this.remoteExplorerService.addDetected(tunnels));
+	}
+
+	dispose(): void {
+		//
+	}
+}

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

@@ -72,16 +72,6 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		return this.urlService.create(uri);
 	}
 
-	async $proposedCreateAppUri(extensionId: ExtensionIdentifier, options?: { payload?: Partial<UriComponents> }): Promise<URI> {
-		const payload: Partial<UriComponents> = options && options.payload ? options.payload : Object.create(null);
-
-		// we define the authority to be the extension ID to ensure
-		// that the Uri gets routed back to the extension properly.
-		payload.authority = extensionId.value;
-
-		return this.urlService.create(payload);
-	}
-
 	dispose(): void {
 		this.handlers.forEach(({ disposable }) => disposable.dispose());
 		this.handlers.clear();

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

@@ -22,9 +22,8 @@ import { VIEWLET_ID as DEBUG } from 'vs/workbench/contrib/debug/common/debug';
 import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/common/remote.contribution';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { URI } from 'vs/base/common/uri';
-import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ShowViewletAction } from 'vs/workbench/browser/viewlet';
+import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ShowViewletAction, Viewlet } from 'vs/workbench/browser/viewlet';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ViewContainerViewlet } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -37,6 +36,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 
 export interface IUserFriendlyViewsContainerDescriptor {
 	id: string;
@@ -315,8 +315,24 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 
 			viewContainer = this.viewContainersRegistry.registerViewContainer(id, true, extensionId);
 
-			// Register as viewlet
-			class CustomViewlet extends ViewContainerViewlet {
+			class CustomViewPaneContainer extends ViewPaneContainer {
+				constructor(
+					@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
+					@ITelemetryService telemetryService: ITelemetryService,
+					@IWorkspaceContextService protected contextService: IWorkspaceContextService,
+					@IStorageService protected storageService: IStorageService,
+					@IConfigurationService configurationService: IConfigurationService,
+					@IInstantiationService protected instantiationService: IInstantiationService,
+					@IThemeService themeService: IThemeService,
+					@IContextMenuService contextMenuService: IContextMenuService,
+					@IExtensionService extensionService: IExtensionService,
+				) {
+					super(id, `${id}.state`, { showHeaderInTitleWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService);
+				}
+			}
+
+			// Register a viewlet
+			class CustomViewlet extends Viewlet {
 				constructor(
 					@IConfigurationService configurationService: IConfigurationService,
 					@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -329,9 +345,10 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 					@IContextMenuService contextMenuService: IContextMenuService,
 					@IExtensionService extensionService: IExtensionService
 				) {
-					super(id, `${id}.state`, true, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService);
+					super(id, instantiationService.createInstance(CustomViewPaneContainer), telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, layoutService, configurationService);
 				}
 			}
+
 			const viewletDescriptor = ViewletDescriptor.create(
 				CustomViewlet,
 				id,