Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exclude port (#16680)

Browse Source
This commit is contained in:
Christof Marti
2016-12-07 12:40:38 -08:00
parent 8eb0cce438
commit c3f1fc8516
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/telemetry/common/workspaceStats.ts
+2 -2
View File
@@ -17,7 +17,7 @@ import { IOptions } from 'vs/workbench/common/options';
const SshProtocolMatcher = /^([^@:]+@)?([^:]+):/;
const SecondLevelDomainMatcher = /[^@.]+\.[^.]+$/;
const SecondLevelDomainMatcher = /([^@:.]+\.[^@:.]+)(:\d+)?$/;
const RemoteMatcher = /^\s*url\s*=\s*(.+\S)\s*$/mg;
type Tags = { [index: string]: boolean | number };
@@ -142,7 +142,7 @@ export class WorkspaceStats {
private stripLowLevelDomains(domain: string): string {
let match = domain.match(SecondLevelDomainMatcher);
return match ? match[0] : null;
return match ? match[1] : null;
}
private extractDomain(url: string): string {
src/vs/workbench/services/telemetry/test/workspaceStats.test.ts
+11 -3
View File
@@ -14,8 +14,10 @@ suite('Telemetry - WorkspaceStats', () => {
const stats = new WorkspaceStats(null, null, null);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://github.com/Microsoft/vscode.git')), ['github.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://git.example.com/gitproject.git')), ['example.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://username@github.com/username/repository.git')), ['github.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://username:password@github.com/username/repository.git')), ['github.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://username@github2.com/username/repository.git')), ['github2.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://username:password@github3.com/username/repository.git')), ['github3.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://username:password@example2.com:1234/username/repository.git')), ['example2.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('https://example3.com:1234/username/repository.git')), ['example3.com']);
});
test('SSH remotes', function () {
@@ -27,7 +29,7 @@ suite('Telemetry - WorkspaceStats', () => {
const stats = new WorkspaceStats(null, null, null);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('git@github.com:Microsoft/vscode.git')), ['github.com']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('user@git.server.org:project.git')), ['server.org']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('git.server.org:project.git')), ['server.org']);
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('git.server2.org:project.git')), ['server2.org']);
});
test('Local remotes', function () {
@@ -36,6 +38,12 @@ suite('Telemetry - WorkspaceStats', () => {
assert.deepStrictEqual(stats.getDomainsOfRemotes(remote('file:///opt/git/project.git')), []);
});
test('Multiple remotes', function () {
const stats = new WorkspaceStats(null, null, null);
const config = ['https://github.com/Microsoft/vscode.git', 'https://git.example.com/gitproject.git'].map(remote).join('');
assert.deepStrictEqual(stats.getDomainsOfRemotes(config).sort(), ['example.com', 'github.com']);
});
function remote(url: string): string {
return `[remote "origin"]
url = ${url}