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

Fix #73127

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-06-30 20:59:29 +02:00
parent 1af379c856
commit 4b77cd2a98
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/workspace/common/workspace.ts
+5 -1
View File
@@ -185,7 +185,11 @@ export class Workspace implements IWorkspace {
return null;
}
return this._foldersMap.findSubstr(resource.toString()) || null;
return this._foldersMap.findSubstr(resource.with({
scheme: resource.scheme,
authority: resource.authority,
path: resource.path
}).toString()) || null;
}
private updateFoldersMap(): void {
src/vs/platform/workspace/test/common/workspace.test.ts
+9
View File
@@ -52,6 +52,15 @@ suite('Workspace', () => {
assert.equal(actual, expected);
});
test('getFolder returns the folder even if the uri has query path', () => {
const expected = new WorkspaceFolder({ uri: testFolderUri, name: '', index: 2 });
let testObject = new Workspace('', [new WorkspaceFolder({ uri: mainFolderUri, name: '', index: 0 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 1 }), expected]);
const actual = testObject.getFolder(URI.file(path.join(fileFolder, 'test/a')).with({ query: 'somequery' }));
assert.equal(actual, expected);
});
test('getFolder returns null if the uri is not sub', () => {
let testObject = new Workspace('', [new WorkspaceFolder({ uri: testFolderUri, name: '', index: 0 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 1 })]);