Merge from vscode 3c6f6af7347d38e87bc6406024e8dcf9e9bce229 (#8962)

* Merge from vscode 3c6f6af7347d38e87bc6406024e8dcf9e9bce229

* skip failing tests

* update mac build image
This commit is contained in:
Anthony Dresser
2020-01-27 15:28:17 -08:00
committed by Karl Burtram
parent 0eaee18dc4
commit fefe1454de
481 changed files with 12764 additions and 7836 deletions

View File

@@ -54,6 +54,10 @@ interface ITunnelFactory {
(tunnelOptions: TunnelOptions): Thenable<Tunnel> | undefined;
}
interface IShowCandidate {
(host: string, port: number, detail: string): Thenable<boolean>;
}
interface IWorkbenchConstructionOptions {
/**
@@ -129,6 +133,11 @@ interface IWorkbenchConstructionOptions {
*/
readonly tunnelFactory?: ITunnelFactory;
/**
* Support for filtering candidate ports
*/
readonly showCandidate?: IShowCandidate;
/**
* Current logging level. Default is `LogLevel.Info`.
*/