ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
View File

@@ -40,8 +40,8 @@ export class RemoteAgentService implements IRemoteAgentService {
class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection {
readonly remoteAuthority: string;
private _connection: Thenable<Client<RemoteAgentConnectionContext>> | null;
private _environment: Thenable<IRemoteAgentEnvironment | null> | null;
private _connection: Promise<Client<RemoteAgentConnectionContext>> | null;
private _environment: Promise<IRemoteAgentEnvironment | null> | null;
constructor(
remoteAuthority: string,
@@ -55,7 +55,7 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
this._environment = null;
}
getEnvironment(): Thenable<IRemoteAgentEnvironment | null> {
getEnvironment(): Promise<IRemoteAgentEnvironment | null> {
if (!this._environment) {
const client = new RemoteExtensionEnvironmentChannelClient(this.getChannel('remoteextensionsenvironment'));
@@ -74,10 +74,10 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
this._getOrCreateConnection().then(client => client.registerChannel(channelName, channel));
}
private _getOrCreateConnection(): Thenable<Client<RemoteAgentConnectionContext>> {
private _getOrCreateConnection(): Promise<Client<RemoteAgentConnectionContext>> {
if (!this._connection) {
this._connection = this._remoteAuthorityResolverService.resolveAuthority(this.remoteAuthority).then((resolvedAuthority) => {
return connectRemoteAgentManagement(this.remoteAuthority, resolvedAuthority.host, resolvedAuthority.port, `renderer`);
return connectRemoteAgentManagement(this.remoteAuthority, resolvedAuthority.host, resolvedAuthority.port, `renderer`, this._environmentService.isBuilt);
});
}
return this._connection;

2
src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
View File

@@ -25,7 +25,7 @@ export class RemoteExtensionEnvironmentChannelClient {
constructor(private channel: IChannel) { }
getEnvironmentData(remoteAuthority: string, extensionDevelopmentPath?: URI): Thenable<IRemoteAgentEnvironment> {
getEnvironmentData(remoteAuthority: string, extensionDevelopmentPath?: URI): Promise<IRemoteAgentEnvironment> {
return this.channel.call<IRemoteAgentEnvironmentDTO>('getEnvironmentData', [remoteAuthority, extensionDevelopmentPath])
.then((data: IRemoteAgentEnvironmentDTO): IRemoteAgentEnvironment => {
return {

2
src/vs/workbench/services/remote/node/remoteAgentService.ts
View File

@@ -35,7 +35,7 @@ export interface IRemoteAgentService {
export interface IRemoteAgentConnection {
readonly remoteAuthority: string;
getEnvironment(): Thenable<IRemoteAgentEnvironment | null>;
getEnvironment(): Promise<IRemoteAgentEnvironment | null>;
getChannel<T extends IChannel>(channelName: string): T;
registerChannel<T extends IServerChannel<RemoteAgentConnectionContext>>(channelName: string, channel: T);