Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues
This commit is contained in:
Anthony Dresser
2019-12-04 19:28:22 -08:00
committed by GitHub
parent a8818ab0df
commit f5ce7fb2a5
1507 changed files with 42813 additions and 27370 deletions

View File

@@ -17,32 +17,49 @@ import { Event, Emitter } from 'vs/base/common/event';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
interface IResourceUriProvider {
(uri: URI): URI;
}
interface IStaticExtension {
packageJSON: IExtensionManifest;
extensionLocation: URI;
}
interface ICommontTelemetryPropertiesResolver {
(): { [key: string]: any };
}
interface IExternalUriResolver {
(uri: URI): Promise<URI>;
}
interface IWorkbenchConstructionOptions {
/**
* Experimental: the remote authority is the IP:PORT from where the workbench is served
* The remote authority is the IP:PORT from where the workbench is served
* from. It is for example being used for the websocket connections as address.
*/
remoteAuthority?: string;
readonly remoteAuthority?: string;
/**
* The connection token to send to the server.
*/
connectionToken?: string;
readonly connectionToken?: string;
/**
* Experimental: An endpoint to serve iframe content ("webview") from. This is required
* An endpoint to serve iframe content ("webview") from. This is required
* to provide full security isolation from the workbench host.
*/
webviewEndpoint?: string;
readonly webviewEndpoint?: string;
/**
* Experimental: a handler for opening workspaces and providing the initial workspace.
* A handler for opening workspaces and providing the initial workspace.
*/
workspaceProvider?: IWorkspaceProvider;
readonly workspaceProvider?: IWorkspaceProvider;
/**
* Experimental: The userDataProvider is used to handle user specific application
* The user data provider is used to handle user specific application
* state like settings, keybindings, UI state (e.g. opened editors) and snippets.
*/
userDataProvider?: IFileSystemProvider;
@@ -50,56 +67,56 @@ interface IWorkbenchConstructionOptions {
/**
* A factory for web sockets.
*/
webSocketFactory?: IWebSocketFactory;
readonly webSocketFactory?: IWebSocketFactory;
/**
* A provider for resource URIs.
*/
resourceUriProvider?: (uri: URI) => URI;
readonly resourceUriProvider?: IResourceUriProvider;
/**
* Experimental: Whether to enable the smoke test driver.
* The credentials provider to store and retrieve secrets.
*/
driver?: boolean;
readonly credentialsProvider?: ICredentialsProvider;
/**
* Experimental: The credentials provider to store and retrieve secrets.
* Add static extensions that cannot be uninstalled but only be disabled.
*/
credentialsProvider?: ICredentialsProvider;
readonly staticExtensions?: ReadonlyArray<IStaticExtension>;
/**
* Experimental: Add static extensions that cannot be uninstalled but only be disabled.
* Support for URL callbacks.
*/
staticExtensions?: { packageJSON: IExtensionManifest, extensionLocation: URI }[];
readonly urlCallbackProvider?: IURLCallbackProvider;
/**
* Experimental: Support for URL callbacks.
* Support for update reporting.
*/
urlCallbackProvider?: IURLCallbackProvider;
readonly updateProvider?: IUpdateProvider;
/**
* Support adding additional properties to telemetry.
*/
readonly resolveCommonTelemetryProperties?: ICommontTelemetryPropertiesResolver;
/**
* Resolves an external uri before it is opened.
*/
readonly resolveExternalUri?: IExternalUriResolver;
/**
* Current logging level. Default is `LogLevel.Info`.
*/
logLevel?: LogLevel;
readonly logLevel?: LogLevel;
/**
* Experimental: Support for update reporting.
* Whether to enable the smoke test driver.
*/
updateProvider?: IUpdateProvider;
/**
* Experimental: Support adding additional properties to telemetry.
*/
resolveCommonTelemetryProperties?: () => { [key: string]: any };
/**
* Experimental: Resolves an external uri before it is opened.
*/
readonly resolveExternalUri?: (uri: URI) => Promise<URI>;
readonly driver?: boolean;
}
/**
* Experimental: Creates the workbench with the provided options in the provided container.
* Creates the workbench with the provided options in the provided container.
*
* @param domElement the container to create the workbench in
* @param options for setting up the workbench
@@ -136,10 +153,14 @@ export {
IWebSocketFactory,
IWebSocket,
// Resources
IResourceUriProvider,
// Credentials
ICredentialsProvider,
// Static Extensions
IStaticExtension,
IExtensionManifest,
// Callbacks
@@ -151,4 +172,10 @@ export {
// Updates
IUpdateProvider,
IUpdate,
// Telemetry
ICommontTelemetryPropertiesResolver,
// External Uris
IExternalUriResolver
};