ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-04 09:35:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 6e530127a1bb8ffbd1bfb77dc680c321dc0d71f5 (#6844)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-20 21:07:47 -07:00
committed by GitHub
parent 1f00249646
commit ecb80f14f0
221 changed files with 3140 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/base/common/network.ts
View File

@@ -49,6 +49,8 @@ export namespace Schemas {
export const vscodeRemote: string = 'vscode-remote';
export const vscodeRemoteResource: string = 'vscode-remote-resource';
export const userData: string = 'vscode-userdata';
}
@@ -64,7 +66,7 @@ class RemoteAuthoritiesImpl {
}
public set(authority: string, host: string, port: number): void {
this._hosts[authority] = (host === 'localhost' ? '127.0.0.1' : host);
this._hosts[authority] = host;
this._ports[authority] = port;
}
@@ -76,9 +78,8 @@ class RemoteAuthoritiesImpl {
const host = this._hosts[authority];
const port = this._ports[authority];
const connectionToken = this._connectionTokens[authority];
const scheme = (host === '127.0.0.1' ? Schemas.http : Schemas.vscodeRemote);
return URI.from({
scheme: scheme,
scheme: Schemas.vscodeRemoteResource,
authority: `${host}:${port}`,
path: `/vscode-remote2`,
query: `path=${encodeURIComponent(path)}&tkn=${encodeURIComponent(connectionToken)}`