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

make asRelativePath work with multiple root folders, #28526

Browse Source
This commit is contained in:
Johannes Rieken
2017-06-12 16:41:40 +02:00
parent f6adea0241
commit 9a4a9a4021
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,19 +19,19 @@ export class ExtHostWorkspace extends ExtHostWorkspaceShape {
private static _requestIdPool = 0;
private _proxy: MainThreadWorkspaceShape;
private _workspacePath: string;
private readonly _proxy: MainThreadWorkspaceShape;
private _workspaceFolders: URI[];
constructor(threadService: IThreadService, folders: URI[]) {
super();
this._proxy = threadService.get(MainContext.MainThreadWorkspace);
this._workspacePath = isFalsyOrEmpty(folders) ? undefined : folders[0].fsPath;
this._workspaceFolders = folders;
}
// --- workspace ---
getPath(): string {
return this._workspacePath;
return isFalsyOrEmpty(this._workspaceFolders) ? undefined : this._workspaceFolders[0].fsPath;
}
getRelativePath(pathOrUri: string | vscode.Uri): string {
@@ -47,20 +47,24 @@ export class ExtHostWorkspace extends ExtHostWorkspaceShape {
return path;
}
if (!this._workspacePath) {
if (isFalsyOrEmpty(this._workspaceFolders)) {
return normalize(path);
}
let result = relative(this._workspacePath, path);
if (!result || result.indexOf('..') === 0) {
return normalize(path);
for (const { fsPath } of this._workspaceFolders) {
let result = relative(fsPath, path);
if (!result || result.indexOf('..') === 0) {
continue;
}
return normalize(result);
}
return normalize(result);
return normalize(path);
}
$acceptWorkspaceData(folders: URI[]): void {
// todo@joh do something, align with ctor URI[] vs IWorkspace
$acceptWorkspaceData(workspaceFolders: URI[]): void {
//TODO@joh equality-check, emit event etc.
this._workspaceFolders = workspaceFolders;
}
// --- search ---