ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode cfbd1999769f4f08dce29629fb92fdc0fac53829

Browse Source
This commit is contained in:
ADS Merger
2020-08-06 07:08:52 +00:00
parent 9c67832880
commit 540046ba00
362 changed files with 7588 additions and 6584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/platform/remote/common/remoteAgentConnection.ts
View File

@@ -14,6 +14,7 @@ import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors
import { ISignService } from 'vs/platform/sign/common/sign';
import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
import { ILogService } from 'vs/platform/log/common/log';
import { IIPCLogger } from 'vs/base/parts/ipc/common/ipc';
export const enum ConnectionType {
Management = 1,
@@ -246,6 +247,7 @@ export interface IConnectionOptions {
addressProvider: IAddressProvider;
signService: ISignService;
logService: ILogService;
ipcLogger: IIPCLogger | null;
}
async function resolveConnectionOptions(options: IConnectionOptions, reconnectionToken: string, reconnectionProtocol: PersistentProtocol | null): Promise<ISimpleConnectionOptions> {
@@ -493,7 +495,7 @@ export class ManagementPersistentConnection extends PersistentConnection {
this.client = this._register(new Client<RemoteAgentConnectionContext>(protocol, {
remoteAuthority: remoteAuthority,
clientId: clientId
}));
}, options.ipcLogger));
}
protected async _reconnect(options: ISimpleConnectionOptions): Promise<void> {

2
src/vs/platform/remote/common/remoteAgentEnvironment.ts
View File

@@ -5,7 +5,6 @@
import { URI } from 'vs/base/common/uri';
import { OperatingSystem } from 'vs/base/common/platform';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
export interface IRemoteAgentEnvironment {
pid: number;
@@ -18,7 +17,6 @@ export interface IRemoteAgentEnvironment {
globalStorageHome: URI;
workspaceStorageHome: URI;
userHome: URI;
extensions: IExtensionDescription[];
os: OperatingSystem;
}

3
src/vs/platform/remote/node/tunnelService.ts
View File

@@ -151,7 +151,8 @@ export class TunnelService extends AbstractTunnelService {
socketFactory: nodeSocketFactory,
addressProvider,
signService: this.signService,
logService: this.logService
logService: this.logService,
ipcLogger: null
};
const tunnel = createRemoteTunnel(options, remoteHost, remotePort, localPort);