Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 (#6575)

This commit is contained in:
Chris LaFreniere
2019-08-02 21:06:44 -07:00
committed by GitHub
parent 402b50c03b
commit 62d2fb534d
103 changed files with 726 additions and 374 deletions

View File

@@ -35,7 +35,6 @@ export interface ConnectionTypeRequest {
signedData?: string;
desiredConnectionType?: ConnectionType;
args?: any;
isBuilt: boolean;
}
export interface ErrorMessage {
@@ -51,7 +50,6 @@ export type HandshakeMessage = AuthRequest | SignRequest | ConnectionTypeRequest
interface ISimpleConnectionOptions {
isBuilt: boolean;
commit: string | undefined;
host: string;
port: number;
@@ -110,8 +108,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
type: 'connectionType',
commit: options.commit,
signedData: signed,
desiredConnectionType: connectionType,
isBuilt: options.isBuilt
desiredConnectionType: connectionType
};
if (args) {
connTypeRequest.args = args;
@@ -200,7 +197,6 @@ async function doConnectRemoteAgentTunnel(options: ISimpleConnectionOptions, sta
}
export interface IConnectionOptions {
isBuilt: boolean;
commit: string | undefined;
socketFactory: ISocketFactory;
addressProvider: IAddressProvider;
@@ -210,7 +206,6 @@ export interface IConnectionOptions {
async function resolveConnectionOptions(options: IConnectionOptions, reconnectionToken: string, reconnectionProtocol: PersistentProtocol | null): Promise<ISimpleConnectionOptions> {
const { host, port } = await options.addressProvider.getAddress();
return {
isBuilt: options.isBuilt,
commit: options.commit,
host: host,
port: port,