Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #114416 LabelService.getUriLabel bad relative path if in root workspace (#114419)

Browse Source 
* fix #114416 LabelService.getUriLabel bad relative path if in root workspace
First commit is just a new test to show the problem.
Second commit will be the fix.

* Push the fix for #114416
This commit is contained in:
John Murray
2021-01-15 18:59:21 +00:00
committed by GitHub
parent 5a25a56695
commit 79cfca5aa2
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/label/common/labelService.ts
View File

@@ -149,6 +149,8 @@ export class LabelService extends Disposable implements ILabelService {
while (relativeLabel[overlap] && relativeLabel[overlap] === baseResourceLabel[overlap]) { overlap++; }
if (!relativeLabel[overlap] || relativeLabel[overlap] === formatting.separator) {
relativeLabel = relativeLabel.substring(1 + overlap);
} else if (overlap === baseResourceLabel.length && baseResource.uri.path === '/') {
relativeLabel = relativeLabel.substring(overlap);
}
const hasMultipleRoots = this.contextService.getWorkspace().folders.length > 1;

60
src/vs/workbench/services/label/test/browser/label.test.ts
View File

@@ -160,7 +160,7 @@ suite('URI Label', () => {
});
suite('multi-root worksapce', () => {
suite('multi-root workspace', () => {
let labelService: LabelService;
setup(() => {
@@ -171,7 +171,7 @@ suite('multi-root worksapce', () => {
labelService = new LabelService(
TestEnvironmentService,
new TestContextService(
new Workspace('test-workspaace', [
new Workspace('test-workspace', [
new WorkspaceFolder({ uri: sources, index: 0, name: 'Sources' }, { uri: sources.toString() }),
new WorkspaceFolder({ uri: tests, index: 1, name: 'Tests' }, { uri: tests.toString() }),
new WorkspaceFolder({ uri: other, index: 2, name: resources.basename(other) }, { uri: other.toString() }),
@@ -179,7 +179,7 @@ suite('multi-root worksapce', () => {
new TestPathService());
});
test('labels of files in multiroot workspaces are the foldername folloed by offset from the folder', () => {
test('labels of files in multiroot workspaces are the foldername followed by offset from the folder', () => {
labelService.registerFormatter({
scheme: 'file',
formatting: {
@@ -250,3 +250,57 @@ suite('multi-root worksapce', () => {
});
});
});
suite('workspace at FSP root', () => {
let labelService: LabelService;
setup(() => {
const rootFolder = URI.parse('myscheme://myauthority/');
labelService = new LabelService(
TestEnvironmentService,
new TestContextService(
new Workspace('test-workspace', [
new WorkspaceFolder({ uri: rootFolder, index: 0, name: 'FSProotFolder' }, { uri: rootFolder.toString() }),
])),
new TestPathService());
labelService.registerFormatter({
scheme: 'myscheme',
formatting: {
label: '${scheme}://${authority}${path}',
separator: '/',
tildify: false,
normalizeDriveLetter: false,
workspaceSuffix: '',
authorityPrefix: '',
stripPathStartingSeparator: false
}
});
});
test('non-relative label', () => {
const tests = {
'myscheme://myauthority/myFile1.txt': 'myscheme://myauthority/myFile1.txt',
'myscheme://myauthority/folder/myFile2.txt': 'myscheme://myauthority/folder/myFile2.txt',
};
Object.entries(tests).forEach(([uriString, label]) => {
const generated = labelService.getUriLabel(URI.parse(uriString), { relative: false });
assert.equal(generated, label);
});
});
test('relative label', () => {
const tests = {
'myscheme://myauthority/myFile1.txt': 'myFile1.txt',
'myscheme://myauthority/folder/myFile2.txt': 'folder/myFile2.txt',
};
Object.entries(tests).forEach(([uriString, label]) => {
const generated = labelService.getUriLabel(URI.parse(uriString), { relative: true });
assert.equal(generated, label);
});
});
});