Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-16 17:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

add test, fix getContainingWorkspaceFolder, #28526

Browse Source
This commit is contained in:
Johannes Rieken
2017-07-14 10:43:31 +02:00
parent e23c3d03ef
commit ee378d4e98
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/node/extHostWorkspace.ts
+1 -1
View File
@@ -37,7 +37,7 @@ class Workspace2 {
const root = this.workspace.getRoot(uri);
if (root) {
for (const folder of this.folders) {
if (folder.uri.toString() === uri.toString()) {
if (folder.uri.toString() === root.toString()) {
return folder;
}
}
src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
+33
View File
@@ -66,6 +66,39 @@ suite('ExtHostWorkspace', function () {
assert.equal(ws.getPath().replace(/\\/g, '/'), '/Folder');
});
test('WorkspaceFolder has name and index', function () {
const ws = new ExtHostWorkspace(new TestThreadService(), { id: 'foo', roots: [URI.file('/Coding/One'), URI.file('/Coding/Two')], name: 'Test' });
const [one, two] = ws.getWorkspaceFolders();
assert.equal(one.name, 'One');
assert.equal(one.index, 0);
assert.equal(two.name, 'Two');
assert.equal(two.index, 1);
});
test('getContainingWorkspaceFolder', function () {
const ws = new ExtHostWorkspace(new TestThreadService(), { id: 'foo', name: 'Test', roots: [URI.file('/Coding/One'), URI.file('/Coding/Two'), URI.file('/Coding/Two/Nested')] });
let folder = ws.getEnclosingWorkspaceFolder(URI.file('/foo/bar'));
assert.equal(folder, undefined);
folder = ws.getEnclosingWorkspaceFolder(URI.file('/Coding/One/file/path.txt'));
assert.equal(folder.name, 'One');
folder = ws.getEnclosingWorkspaceFolder(URI.file('/Coding/Two/file/path.txt'));
assert.equal(folder.name, 'Two');
folder = ws.getEnclosingWorkspaceFolder(URI.file('/Coding/Two/Nest'));
assert.equal(folder.name, 'Two');
folder = ws.getEnclosingWorkspaceFolder(URI.file('/Coding/Two/Nested/file'));
assert.equal(folder.name, 'Nested');
// folder = ws.getEnclosingWorkspaceFolder(URI.file('/Coding/Two/Nested'));
// assert.equal(folder.name, 'Two');
});
test('Multiroot change event should have a delta, #29641', function () {
let ws = new ExtHostWorkspace(new TestThreadService(), { id: 'foo', name: 'Test', roots: [] });