Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

updateWorkspaceFolders tests

Browse Source
This commit is contained in:
Benjamin Pasero
2018-01-25 12:19:53 +01:00
parent 1a381b4996
commit c345b67b84
2 changed files with 175 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/node/extHostWorkspace.ts
View File

@@ -64,19 +64,11 @@ class Workspace2 extends Workspace {
}
static compareWorkspaceFolderByUri(a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder, includeName?: boolean): number {
if (isFolderEqual(a.uri, b.uri)) {
return 0;
}
return compare(a.uri.toString(), b.uri.toString());
return isFolderEqual(a.uri, b.uri) ? 0 : compare(a.uri.toString(), b.uri.toString());
}
static compareWorkspaceFolderByUriAndName(a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder): number {
if (isFolderEqual(a.uri, b.uri) && compare(a.name, b.name) === 0) {
return 0;
}
return compare(a.uri.toString(), b.uri.toString()) + compare(a.name, b.name);
return isFolderEqual(a.uri, b.uri) ? compare(a.name, b.name) : compare(a.uri.toString(), b.uri.toString());
}
private static _findFolder(workspace: Workspace2, folderUriToFind: URI): WorkspaceFolder {