wlxsp
/
test1
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fixes repository uri normalization

main
Eric Amodio 2 years ago
parent
aa5dbdcb66
commit
31c7405ca3
4 changed files with 282 additions and 226 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -13
      src/git/gitProviderService.ts
  2. +51
    -1
      src/repositories.ts
  3. +17
    -2
      src/system/trie.ts
  4. +211
    -210
      src/test/suite/system/trie.test.ts

+ 3
- 13
src/git/gitProviderService.ts View File

@ -29,7 +29,7 @@ import {
import type { Container } from '../container';
import { ProviderNotFoundError } from '../errors';
import { Logger } from '../logger';
import { Repositories } from '../repositories';
import { asRepoComparisonKey, RepoComparisionKey, Repositories } from '../repositories';
import { groupByFilterMap, groupByMap } from '../system/array';
import { gate } from '../system/decorators/gate';
import { debug, log } from '../system/decorators/log';
@ -1422,7 +1422,7 @@ export class GitProviderService implements Disposable {
return (editor != null ? this.getRepository(editor.document.uri) : undefined) ?? this.highlander;
}
private _pendingRepositories = new Map<string, Promise<Repository | undefined>>();
private _pendingRepositories = new Map<RepoComparisionKey, Promise<Repository | undefined>>();
@log<GitProviderService['getOrOpenRepository']>({ exit: r => `returned ${r?.path}` })
async getOrOpenRepository(uri: Uri, detectNested?: boolean): Promise<Repository | undefined> {
@ -1438,7 +1438,7 @@ export class GitProviderService implements Disposable {
return repository;
}
const key = asKey(uri);
const key = asRepoComparisonKey(uri);
let promise = this._pendingRepositories.get(key);
if (promise == null) {
async function findRepository(this: GitProviderService): Promise<Repository | undefined> {
@ -1818,13 +1818,3 @@ export class GitProviderService implements Disposable {
return encoding != null && encodingExists(encoding) ? encoding : 'utf8';
}
}
export function asKey(uri: Uri): string;
export function asKey(uri: Uri | undefined): string | undefined;
export function asKey(uri: Uri | undefined): string | undefined {
if (uri === undefined) return undefined;
const hasTrailingSlash = uri.path.endsWith('/');
if (!hasTrailingSlash && !uri.fragment) return uri.toString();
return uri.with({ path: hasTrailingSlash ? uri.path.slice(0, -1) : uri.path, fragment: '' }).toString();
}

+ 51
- 1
src/repositories.ts View File

@ -1,13 +1,63 @@
import { Uri } from 'vscode';
import { DocumentSchemes } from './constants';
import { isLinux } from './env/node/platform';
import { Repository } from './git/models/repository';
import { normalizePath } from './system/path';
import { UriTrie } from './system/trie';
// TODO@eamodio don't import from string here since it will break the tests because of ESM dependencies
// import { CharCode } from './string';
const slash = 47; //CharCode.Slash;
export type RepoComparisionKey = string & { __type__: 'RepoComparisionKey' };
export function asRepoComparisonKey(uri: Uri): RepoComparisionKey {
const { path } = normalizeRepoUri(uri);
return path as RepoComparisionKey;
}
export function normalizeRepoUri(uri: Uri): { path: string; ignoreCase: boolean } {
let path;
switch (uri.scheme.toLowerCase()) {
case DocumentSchemes.File:
path = normalizePath(uri.fsPath);
return { path: path, ignoreCase: !isLinux };
case DocumentSchemes.Git:
case DocumentSchemes.GitLens:
path = uri.path;
if (path.charCodeAt(path.length - 1) === slash) {
path = path.slice(1, -1);
} else {
path = path.slice(1);
}
return { path: path, ignoreCase: !isLinux };
case DocumentSchemes.Virtual:
case DocumentSchemes.GitHub:
path = uri.path;
if (path.charCodeAt(path.length - 1) === slash) {
path = path.slice(0, -1);
}
return { path: uri.authority ? `${uri.authority}${path}` : path.slice(1), ignoreCase: false };
default:
path = uri.path;
if (path.charCodeAt(path.length - 1) === slash) {
path = path.slice(1, -1);
} else {
path = path.slice(1);
}
return { path: path, ignoreCase: false };
}
}
export class Repositories {
private readonly _trie: UriTrie<Repository>;
private _count: number = 0;
constructor() {
this._trie = new UriTrie<Repository>();
this._trie = new UriTrie<Repository>(normalizeRepoUri);
}
get count(): number {

+ 17
- 2
src/system/trie.ts View File

@ -12,11 +12,25 @@ function normalizeUri(uri: Uri): { path: string; ignoreCase: boolean } {
switch (uri.scheme.toLowerCase()) {
case DocumentSchemes.File:
path = normalizePath(uri.fsPath);
return { path: uri.authority ? `${uri.authority}/${path}` : path, ignoreCase: !isLinux };
case DocumentSchemes.GitLens:
return { path: path, ignoreCase: !isLinux };
case DocumentSchemes.Git:
path = normalizePath(uri.fsPath);
// TODO@eamodio parse the ref out of the query
return { path: path, ignoreCase: !isLinux };
case DocumentSchemes.GitLens:
path = uri.path;
if (path.charCodeAt(path.length - 1) === slash) {
path = path.slice(0, -1);
}
if (!isLinux) {
path = path.toLowerCase();
}
return { path: uri.authority ? `${uri.authority}${path}` : path.slice(1), ignoreCase: false };
case DocumentSchemes.Virtual:
case DocumentSchemes.GitHub:
path = uri.path;
@ -24,6 +38,7 @@ function normalizeUri(uri: Uri): { path: string; ignoreCase: boolean } {
path = path.slice(0, -1);
}
return { path: uri.authority ? `${uri.authority}${path}` : path.slice(1), ignoreCase: false };
default:
path = uri.path;
if (path.charCodeAt(path.length - 1) === slash) {

+ 211
- 210
src/test/suite/system/trie.test.ts View File

@ -2,6 +2,7 @@ import * as assert from 'assert';
import { basename } from 'path';
import { Uri } from 'vscode';
import { isLinux } from '../../../env/node/platform';
import { normalizeRepoUri } from '../../../repositories';
import { PathEntryTrie, UriEntry, UriEntryTrie, UriTrie } from '../../../system/trie';
// eslint-disable-next-line import/extensions
import paths from './paths.json';
@ -442,102 +443,102 @@ describe('UriEntryTrie Test Suite', () => {
);
});
it('has(gitlens://): repo', () => {
assert.strictEqual(
trie.has(
repoGL.uri.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
true,
);
assert.strictEqual(
trie.has(
Uri.parse(
repoGL.uri
.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
})
.toString()
.toUpperCase(),
),
),
!isLinux,
);
assert.strictEqual(
trie.has(
repoNested.uri.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
true,
);
assert.strictEqual(
trie.has(
Uri.parse(
repoNested.uri
.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
})
.toString()
.toUpperCase(),
),
),
!isLinux,
);
assert.strictEqual(
trie.has(
Uri.file('C:\\Users\\Name\\code\\company\\repo').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
false,
);
});
it('has(gitlens://): file', () => {
assert.strictEqual(
trie.has(
Uri.joinPath(repoGL.uri, 'src/extension.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
true,
);
assert.strictEqual(
trie.has(
Uri.joinPath(repoGL.uri, 'foo/bar/baz.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
false,
);
assert.strictEqual(
trie.has(
Uri.joinPath(repoNested.uri, 'src/index.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
true,
);
});
// it('has(gitlens://): repo', () => {
// assert.strictEqual(
// trie.has(
// repoGL.uri.with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// true,
// );
// assert.strictEqual(
// trie.has(
// Uri.parse(
// repoGL.uri
// .with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// })
// .toString()
// .toUpperCase(),
// ),
// ),
// !isLinux,
// );
// assert.strictEqual(
// trie.has(
// repoNested.uri.with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// true,
// );
// assert.strictEqual(
// trie.has(
// Uri.parse(
// repoNested.uri
// .with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// })
// .toString()
// .toUpperCase(),
// ),
// ),
// !isLinux,
// );
// assert.strictEqual(
// trie.has(
// Uri.file('C:\\Users\\Name\\code\\company\\repo').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// false,
// );
// });
// it('has(gitlens://): file', () => {
// assert.strictEqual(
// trie.has(
// Uri.joinPath(repoGL.uri, 'src/extension.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// true,
// );
// assert.strictEqual(
// trie.has(
// Uri.joinPath(repoGL.uri, 'foo/bar/baz.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// false,
// );
// assert.strictEqual(
// trie.has(
// Uri.joinPath(repoNested.uri, 'src/index.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// true,
// );
// });
it('get(file://): repo', () => {
assertRepoEntry(trie.get(repoGL.uri), repoGL);
@ -560,29 +561,29 @@ describe('UriEntryTrie Test Suite', () => {
assertRepoEntry(trie.get(repoVSCvfs.uri.with({ scheme: 'github' })), repoVSCvfs);
});
it('get(gitlens://): repo', () => {
assertRepoEntry(
trie.get(
repoGL.uri.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
repoGL,
);
assertRepoEntry(
trie.get(
repoNested.uri.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
repoNested,
);
});
// it('get(gitlens://): repo', () => {
// assertRepoEntry(
// trie.get(
// repoGL.uri.with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// repoGL,
// );
// assertRepoEntry(
// trie.get(
// repoNested.uri.with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// repoNested,
// );
// });
it('get(file://): repo (ignore case)', () => {
assertRepoEntryIgnoreCase(trie.get(repoGL.uri.with({ path: repoGL.uri.path.toUpperCase() })), repoGL);
@ -615,34 +616,34 @@ describe('UriEntryTrie Test Suite', () => {
);
});
it('get(gitlens://): repo (ignore case)', () => {
assertRepoEntry(
trie.get(
repoGL.uri.with({
scheme: 'GITLENS',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
repoGL,
);
assertRepoEntryIgnoreCase(
trie.get(
Uri.parse(
repoGL.uri
.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
})
.toString()
.toUpperCase(),
),
),
repoGL,
);
});
// it('get(gitlens://): repo (ignore case)', () => {
// assertRepoEntry(
// trie.get(
// repoGL.uri.with({
// scheme: 'GITLENS',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// repoGL,
// );
// assertRepoEntryIgnoreCase(
// trie.get(
// Uri.parse(
// repoGL.uri
// .with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// })
// .toString()
// .toUpperCase(),
// ),
// ),
// repoGL,
// );
// });
it('get(file://): file', () => {
let uri = Uri.joinPath(repoGL.uri, 'src/extension.ts');
@ -664,19 +665,19 @@ describe('UriEntryTrie Test Suite', () => {
assertFileEntry(trie.get(uri.with({ scheme: 'github' })), uri);
});
it('get(gitlens://): file', () => {
const uri = Uri.joinPath(repoGL.uri, 'src/extension.ts');
assertFileEntry(
trie.get(
uri.with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
uri,
);
});
// it('get(gitlens://): file', () => {
// const uri = Uri.joinPath(repoGL.uri, 'src/extension.ts');
// assertFileEntry(
// trie.get(
// uri.with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// uri,
// );
// });
it('get: missing file', () => {
assert.strictEqual(trie.get(Uri.joinPath(repoGL.uri, 'foo/bar/baz.ts')), undefined);
@ -707,19 +708,19 @@ describe('UriEntryTrie Test Suite', () => {
);
});
it('getClosest(gitlens://): file', () => {
assertRepoEntry(
trie.getClosest(
Uri.joinPath(repoGL.uri, 'src/extension.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
true,
),
repoGL,
);
});
// it('getClosest(gitlens://): file', () => {
// assertRepoEntry(
// trie.getClosest(
// Uri.joinPath(repoGL.uri, 'src/extension.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// true,
// ),
// repoGL,
// );
// });
it('getClosest(file://): missing repo file', () => {
assertRepoEntry(trie.getClosest(Uri.joinPath(repoGL.uri, 'foo/bar/baz.ts'), true), repoGL);
@ -736,41 +737,41 @@ describe('UriEntryTrie Test Suite', () => {
);
});
it('getClosest(gitlens://): missing repo file', () ="o">=> {
assertRepoEntry(
trie.getClosest(
Uri.joinPath(repoGL.uri, 'src/extension.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
true,
),
repoGL,
);
assertRepoEntry(
trie.getClosest(
Uri.joinPath(repoGL.uri, 'foo/bar/baz.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
repoGL,
);
assertRepoEntry(
trie.getClosest(
Uri.joinPath(repoNested.uri, 'foo/bar/baz.ts').with({
scheme: 'gitlens',
authority: 'abcd',
query: JSON.stringify({ ref: '1234567890' }),
}),
),
repoNested,
);
});
// it('getClosest(gitlens://): missing repo file', () => {
// assertRepoEntry(
// trie.getClosest(
// Uri.joinPath(repoGL.uri, 'src/extension.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// true,
// ),
// repoGL,
// );
// assertRepoEntry(
// trie.getClosest(
// Uri.joinPath(repoGL.uri, 'foo/bar/baz.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// repoGL,
// );
// assertRepoEntry(
// trie.getClosest(
// Uri.joinPath(repoNested.uri, 'foo/bar/baz.ts').with({
// scheme: 'gitlens',
// authority: 'abcd',
// query: JSON.stringify({ ref: '1234567890' }),
// }),
// ),
// repoNested,
// );
// });
it("getClosest: path doesn't exists anywhere", () => {
assert.strictEqual(
@ -780,7 +781,7 @@ describe('UriEntryTrie Test Suite', () => {
});
});
describe('Repositories Test Suite', () => {
describe('UriTrie(Repositories) Test Suite', () => {
type Repo = { type: 'repo'; name: string; uri: Uri; fsPath: string };
const repoGL: Repo = {
@ -808,7 +809,7 @@ describe('Repositories Test Suite', () => {
fsPath: 'github/microsoft/vscode',
};
const trie = new UriTrie<Repo>();
const trie = new UriTrie<Repo>(normalizeRepoUri);
function assertRepoEntry(actual: Repo | undefined, expected: Repo): void {
// assert.strictEqual(actual?.path, expected.name);

Write Preview
Loading…
Cancel
Save