Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions

View File

@@ -5,13 +5,14 @@
import 'vs/workbench/workbench.web.main';
import { main } from 'vs/workbench/browser/web.main';
import { UriComponents } from 'vs/base/common/uri';
import { UriComponents, URI } from 'vs/base/common/uri';
import { IFileSystemProvider } from 'vs/platform/files/common/files';
import { IWebSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
import { ICredentialsProvider } from 'vs/workbench/services/credentials/browser/credentialsService';
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
import { IProductConfiguration } from 'vs/platform/product/common/product';
import { LogLevel } from 'vs/platform/log/common/log';
import { IUpdateProvider } from 'vs/workbench/services/update/browser/updateService';
export interface IWorkbenchConstructionOptions {
@@ -19,7 +20,7 @@ export interface IWorkbenchConstructionOptions {
* Experimental: 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;
remoteAuthority?: string;
/**
* The connection token to send to the server.
@@ -53,6 +54,11 @@ export interface IWorkbenchConstructionOptions {
*/
webSocketFactory?: IWebSocketFactory;
/**
* A provider for resource URIs.
*/
resourceUriProvider?: (uri: URI) => UriComponents;
/**
* Experimental: Whether to enable the smoke test driver.
*/
@@ -74,9 +80,14 @@ export interface IWorkbenchConstructionOptions {
urlCallbackProvider?: IURLCallbackProvider;
/**
* Experimental: Support for product configuration.
* Current logging level. Default is `LogLevel.Info`.
*/
productConfiguration?: IProductConfiguration;
logLevel?: LogLevel;
/**
* Experimental: Support for update reporting.
*/
updateProvider?: IUpdateProvider;
}
/**