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

Introduce WorkspaceFolder model that wraps information about a workspace folder.

Browse Source 
Use WorkspaceFolder instead of URIs in IWorkspaceContextService
This commit is contained in:
Sandeep Somavarapu
2017-09-16 14:01:23 +02:00
parent 3339ad83f1
commit 80e2c7a338
53 changed files with 551 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/base/common/labels.ts
View File

@@ -18,9 +18,9 @@ export interface ILabelProvider {
}
export interface IWorkspaceFolderProvider {
getWorkspaceFolder(resource: URI): URI;
getWorkspaceFolder(resource: URI): { uri: URI };
getWorkspace(): {
folders: URI[];
folders: { uri: URI }[];
};
}
@@ -43,14 +43,14 @@ export function getPathLabel(resource: URI | string, rootProvider?: IWorkspaceFo
const hasMultipleRoots = rootProvider.getWorkspace().folders.length > 1;
let pathLabel: string;
if (isEqual(baseResource.fsPath, resource.fsPath, !platform.isLinux /* ignorecase */)) {
if (isEqual(baseResource.uri.fsPath, resource.fsPath, !platform.isLinux /* ignorecase */)) {
pathLabel = ''; // no label if pathes are identical
} else {
pathLabel = normalize(ltrim(resource.fsPath.substr(baseResource.fsPath.length), nativeSep), true);
pathLabel = normalize(ltrim(resource.fsPath.substr(baseResource.uri.fsPath.length), nativeSep), true);
}
if (hasMultipleRoots) {
const rootName = basename(baseResource.fsPath);
const rootName = basename(baseResource.uri.fsPath);
pathLabel = pathLabel ? join(rootName, pathLabel) : rootName; // always show root basename if there are multiple
}