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

workspaces - actually use workspace

Browse Source
This commit is contained in:
Benjamin Pasero
2021-01-21 14:49:18 +01:00
parent a49455b528
commit 758f66b598
9 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/services/label/common/labelService.ts
View File

@@ -208,30 +208,32 @@ export class LabelService extends Disposable implements ILabelService {
return '';
}
private doGetWorkspaceLabel(configPath: URI, options?: { verbose: boolean }): string {
private doGetWorkspaceLabel(workspaceUri: URI, options?: { verbose: boolean }): string {
// Workspace: Untitled
if (isUntitledWorkspace(configPath, this.environmentService)) {
if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
return localize('untitledWorkspace', "Untitled (Workspace)");
}
// Workspace: Saved
let filename = basename(configPath);
let filename = basename(workspaceUri);
if (filename.endsWith(WORKSPACE_EXTENSION)) {
filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
}
let label;
if (options && options.verbose) {
label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(configPath), filename)));
label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspaceUri), filename)));
} else {
label = localize('workspaceName', "{0} (Workspace)", filename);
}
return this.appendWorkspaceSuffix(label, configPath);
return this.appendWorkspaceSuffix(label, workspaceUri);
}
private doGetSingleFolderWorkspaceLabel(folder: URI, options?: { verbose: boolean }): string {
// Folder on disk
const label = options && options.verbose ? this.getUriLabel(folder) : basename(folder) || '/';
return this.appendWorkspaceSuffix(label, folder);
private doGetSingleFolderWorkspaceLabel(folderUri: URI, options?: { verbose: boolean }): string {
const label = options && options.verbose ? this.getUriLabel(folderUri) : basename(folderUri) || '/';
return this.appendWorkspaceSuffix(label, folderUri);
}
getSeparator(scheme: string, authority?: string): '/' | '\\' {