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

Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

Browse Source
This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/vscode-test-resolver/package.json
View File

@@ -27,7 +27,13 @@
],
"main": "./out/extension",
"devDependencies": {
"@types/node": "^12.19.9"
"@types/node": "14.x"
},
"capabilities": {
"untrustedWorkspaces": {
"supported": true
},
"virtualWorkspaces": true
},
"contributes": {
"resourceLabelFormatters": [
@@ -83,7 +89,7 @@
"statusBar/remoteIndicator": [
{
"command": "vscode-testresolver.newWindow",
"when": "!remoteName",
"when": "!remoteName && !virtualWorkspace",
"group": "remote_90_test_1_local@2"
},
{

17
extensions/vscode-test-resolver/src/extension.ts
View File

@@ -52,7 +52,7 @@ export function activate(context: vscode.ExtensionContext) {
const match = lastProgressLine.match(/Extension host agent listening on (\d+)/);
if (match) {
isResolved = true;
res(new vscode.ResolvedAuthority('localhost', parseInt(match[1], 10))); // success!
res(new vscode.ResolvedAuthority('127.0.0.1', parseInt(match[1], 10))); // success!
}
lastProgressLine = '';
} else if (chr === CharCode.Backspace) {
@@ -200,7 +200,7 @@ export function activate(context: vscode.ExtensionContext) {
}
});
});
proxyServer.listen(0, () => {
proxyServer.listen(0, '127.0.0.1', () => {
const port = (<net.AddressInfo>proxyServer.address()).port;
outputChannel.appendLine(`Going through proxy at port ${port}`);
const r: vscode.ResolverResult = new vscode.ResolvedAuthority('127.0.0.1', port);
@@ -216,6 +216,9 @@ export function activate(context: vscode.ExtensionContext) {
}
const authorityResolverDisposable = vscode.workspace.registerRemoteAuthorityResolver('test', {
async getCanonicalURI(uri: vscode.Uri): Promise<vscode.Uri> {
return vscode.Uri.file(uri.path);
},
resolve(_authority: string): Thenable<vscode.ResolvedAuthority> {
return vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
@@ -265,7 +268,7 @@ export function activate(context: vscode.ExtensionContext) {
const port = Number.parseInt(result);
vscode.workspace.openTunnel({
remoteAddress: {
host: 'localhost',
host: '127.0.0.1',
port: port
},
localAddressPort: port + 1
@@ -403,10 +406,10 @@ async function tunnelFactory(tunnelOptions: vscode.TunnelOptions, tunnelCreation
if (localPort < 1024 && process.platform !== 'win32') {
localPort = 0;
}
proxyServer.listen(localPort, () => {
proxyServer.listen(localPort, '127.0.0.1', () => {
const localPort = (<net.AddressInfo>proxyServer.address()).port;
outputChannel.appendLine(`New test resolver tunnel service: Remote ${tunnelOptions.remoteAddress.port} -> local ${localPort}`);
const tunnel = newTunnel({ host: 'localhost', port: localPort });
const tunnel = newTunnel({ host: '127.0.0.1', port: localPort });
tunnel.onDidDispose(() => proxyServer.close());
res(tunnel);
});
@@ -420,8 +423,8 @@ function runHTTPTestServer(port: number): vscode.Disposable {
res.end(`Hello, World from test server running on port ${port}!`);
});
remoteServers.push(port);
server.listen(port);
const message = `Opened HTTP server on http://localhost:${port}`;
server.listen(port, '127.0.0.1');
const message = `Opened HTTP server on http://127.0.0.1:${port}`;
console.log(message);
outputChannel.appendLine(message);
return {

8
extensions/vscode-test-resolver/yarn.lock
View File

@@ -2,7 +2,7 @@
# yarn lockfile v1
"@types/node@^12.19.9":
version "12.20.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.14.tgz#9caf7eea0df08b406829889cc015256a6d81ab10"
integrity sha512-iFJOS5Q470FF+r4Ol2pSley7/wCNVqf+jgjhtxLLaJcDs+To2iCxlXIkJXrGLD9w9G/oJ9ibySu7z92DCwr7Pg==
"@types/node@14.x":
version "14.14.43"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==