VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>

src/vs/workbench/workbench.web.api.ts

@@ -7,7 +7,6 @@ import 'vs/workbench/workbench.web.main';
 import { main } from 'vs/workbench/browser/web.main';
 import { UriComponents, URI } from 'vs/base/common/uri';
 import { IWebSocketFactory, IWebSocket } from 'vs/platform/remote/browser/browserSocketFactory';
-import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
 import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
 import { LogLevel } from 'vs/platform/log/common/log';
 import { IUpdateProvider, IUpdate } from 'vs/workbench/services/update/browser/updateService';
@@ -24,11 +23,11 @@ interface IResourceUriProvider {
 	(uri: URI): URI;
 }
 
-interface IStaticExtension {
-	packageJSON: IExtensionManifest;
-	extensionLocation: UriComponents;
-	isBuiltin?: boolean;
-}
+/**
+ * The identifier of an extension in the format: `PUBLISHER.NAME`.
+ * For example: `vscode.csharp`
+ */
+type ExtensionId = string;
 
 interface ICommonTelemetryPropertiesResolver {
 	(): { [key: string]: any };
@@ -72,9 +71,11 @@ interface ITunnelOptions {
 	label?: string;
 
 	public?: boolean;
+
+	protocol?: string;
 }
 
-export interface TunnelCreationOptions {
+interface TunnelCreationOptions {
 
 	/**
 	 * True when the local operating system will require elevation to use the requested local port.
@@ -93,6 +94,11 @@ interface ITunnel {
 
 	public?: boolean;
 
+	/**
+	 * If protocol is not provided, it is assumed to be http, regardless of the localAddress
+	 */
+	protocol?: string;
+
 	/**
 	 * Implementers of Tunnel should fire onDidDispose when dispose is called.
 	 */
@@ -147,7 +153,7 @@ interface IWindowIndicator {
 	/**
 	 * Triggering this event will cause the window indicator to update.
 	 */
-	onDidChange: Event<void>;
+	readonly onDidChange?: Event<void>;
 
 	/**
 	 * Label of the window indicator may include octicons
@@ -179,20 +185,39 @@ interface IInitialColorTheme {
 	/**
 	 * Initial color theme type.
 	 */
-	themeType: ColorScheme;
+	readonly themeType: ColorScheme;
 
 	/**
 	 * A list of workbench colors to apply initially.
 	 */
-	colors?: { [colorId: string]: string };
+	readonly colors?: { [colorId: string]: string };
 }
 
 interface IDefaultView {
 	readonly id: string;
 }
 
+interface IPosition {
+	readonly line: number;
+	readonly column: number;
+}
+
+interface IRange {
+
+	/**
+	 * The start position. It is before or equal to end position.
+	 */
+	readonly start: IPosition;
+
+	/**
+	 * The end position. It is after or equal to start position.
+	 */
+	readonly end: IPosition;
+}
+
 interface IDefaultEditor {
 	readonly uri: UriComponents;
+	readonly selection?: IRange;
 	readonly openOnlyIfExists?: boolean;
 	readonly openWith?: string;
 }
@@ -200,7 +225,11 @@ interface IDefaultEditor {
 interface IDefaultLayout {
 	readonly views?: IDefaultView[];
 	readonly editors?: IDefaultEditor[];
-	/** Forces this layout to be applied even if this isn't the first time the workspace has been opened */
+
+	/**
+	 * Forces this layout to be applied even if this isn't
+	 * the first time the workspace has been opened
+	 */
 	readonly force?: boolean;
 }
 
@@ -258,9 +287,17 @@ interface IWorkbenchConstructionOptions {
 
 	/**
 	 * An URL pointing to the web worker extension host <iframe> src.
+	 * @deprecated. This will be removed soon.
 	 */
 	readonly webWorkerExtensionHostIframeSrc?: string;
 
+	/**
+	 * [TEMPORARY]: This will be removed soon.
+	 * Use an unique origin for the web worker extension host.
+	 * Defaults to false.
+	 */
+	readonly __uniqueWebWorkerExtensionHostOrigin?: boolean;
+
 	/**
 	 * A factory for web sockets.
 	 */
@@ -297,15 +334,6 @@ interface IWorkbenchConstructionOptions {
 	 */
 	readonly workspaceProvider?: IWorkspaceProvider;
 
-	/**
-	 * Enables Settings Sync by default.
-	 *
-	 * Syncs with the current authenticated user account (provided in [credentialsProvider](#credentialsProvider)) by default.
-	 *
-	 * @deprecated Instead use [settingsSyncOptions](#settingsSyncOptions) to enable/disable settings sync in the workbench.
-	 */
-	readonly enableSyncByDefault?: boolean;
-
 	/**
 	 * Settings sync options
 	 */
@@ -317,14 +345,18 @@ interface IWorkbenchConstructionOptions {
 	readonly credentialsProvider?: ICredentialsProvider;
 
 	/**
-	 * Add static extensions that cannot be uninstalled but only be disabled.
+	 * Additional builtin extensions that cannot be uninstalled but only be disabled.
+	 * It can be one of the following:
+	 * 	- `ExtensionId`: id of the extension that is available in Marketplace
+	 * 	- `UriComponents`: location of the extension where it is hosted.
 	 */
-	readonly staticExtensions?: readonly IStaticExtension[];
+	readonly additionalBuiltinExtensions?: readonly (ExtensionId | UriComponents)[];
 
 	/**
-	 * Filter for built-in extensions.
+	 * List of extensions to be enabled if they are installed.
+	 * Note: This will not install extensions if not installed.
 	 */
-	readonly builtinExtensionsFilter?: (extensionId: string) => boolean;
+	readonly enabledExtensions?: readonly ExtensionId[];
 
 	/**
 	 * [TEMPORARY]: This will be removed soon.
@@ -334,11 +366,10 @@ interface IWorkbenchConstructionOptions {
 	readonly _enableBuiltinExtensions?: boolean;
 
 	/**
-	 * Allows the workbench to skip checking whether an extension was built for the web
-	 * and assumes they are addressable via the `Microsoft.VisualStudio.Code.WebResources`
-	 * asset URI.
+	 * Additional domains allowed to open from the workbench without the
+	 * link protection popup.
 	 */
-	readonly assumeGalleryExtensionsAreAddressable?: boolean;
+	readonly additionalTrustedDomains?: string[];
 
 	/**
 	 * Support for URL callbacks.
@@ -438,7 +469,7 @@ interface IDevelopmentOptions {
 	/**
 	 * Add extensions under development.
 	 */
-	readonly extensions?: readonly IStaticExtension[];
+	readonly extensions?: readonly UriComponents[];
 
 	/**
 	 * Whether to enable the smoke test driver.
@@ -462,6 +493,7 @@ interface IPerformanceMark {
 interface IWorkbench {
 
 	commands: {
+
 		/**
 		 * @see [executeCommand](#commands.executeCommand)
 		 */
@@ -469,12 +501,21 @@ interface IWorkbench {
 	}
 
 	env: {
+
+		/**
+		 * @see [getUriScheme](#env.getUriScheme)
+		 */
 		readonly uriScheme: string;
+
 		/**
 		 * @see [retrievePerformanceMarks](#commands.retrievePerformanceMarks)
 		 */
 		retrievePerformanceMarks(): Promise<[string, readonly IPerformanceMark[]][]>;
-		openUri(uri: URI): Promise<boolean>;
+
+		/**
+		 * @see [openUri](#env.openUri)
+		 */
+		openUri(target: URI): Promise<boolean>;
 	}
 
 	/**
@@ -575,13 +616,23 @@ namespace env {
 		return workbench.env.retrievePerformanceMarks();
 	}
 
+	/**
+	 * @returns the scheme to use for opening the associated desktop
+	 * experience via protocol handler.
+	 */
 	export async function getUriScheme(): Promise<string> {
 		const workbench = await workbenchPromise;
+
 		return workbench.env.uriScheme;
 	}
 
+	/**
+	 * Allows to open a `URI` with the standard opener service of the
+	 * workbench.
+	 */
 	export async function openUri(target: URI): Promise<boolean> {
 		const workbench = await workbenchPromise;
+
 		return workbench.env.openUri(target);
 	}
 }
@@ -615,10 +666,6 @@ export {
 	// Credentials
 	ICredentialsProvider,
 
-	// Static Extensions
-	IStaticExtension,
-	IExtensionManifest,
-
 	// Callbacks
 	IURLCallbackProvider,
 
@@ -662,6 +709,8 @@ export {
 	IDefaultView,
 	IDefaultEditor,
 	IDefaultLayout,
+	IPosition,
+	IRange as ISelection,
 
 	// Env
 	IPerformanceMark,