Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2

This commit is contained in:
ADS Merger
2020-04-23 02:50:35 +00:00
committed by Anthony Dresser
parent 3603f55d97
commit 7f1d8fc32f
659 changed files with 22709 additions and 12497 deletions

View File

@@ -144,7 +144,7 @@ export interface IWorkspaceFolder extends IWorkspaceFolderData {
export class Workspace implements IWorkspace {
private _foldersMap: TernarySearchTree<string, WorkspaceFolder> = TernarySearchTree.forPaths<WorkspaceFolder>();
private _foldersMap: TernarySearchTree<URI, WorkspaceFolder> = TernarySearchTree.forUris<WorkspaceFolder>();
private _folders!: WorkspaceFolder[];
constructor(
@@ -191,13 +191,13 @@ export class Workspace implements IWorkspace {
scheme: resource.scheme,
authority: resource.authority,
path: resource.path
}).toString()) || null;
})) || null;
}
private updateFoldersMap(): void {
this._foldersMap = TernarySearchTree.forPaths<WorkspaceFolder>();
this._foldersMap = TernarySearchTree.forUris<WorkspaceFolder>();
for (const folder of this.folders) {
this._foldersMap.set(folder.uri.toString(), folder);
this._foldersMap.set(folder.uri, folder);
}
}