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

further remove single workspace identifier traces

Browse Source
This commit is contained in:
Benjamin Pasero
2021-01-21 08:28:47 +01:00
parent 46b964b1b7
commit 44eb775d1d
7 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
import { IWorkspaceContextService, IWorkspace } from 'vs/platform/workspace/common/workspace';
import { basenameOrAuthority, basename, joinPath, dirname } from 'vs/base/common/resources';
import { tildify, getPathLabel } from 'vs/base/common/labels';
import { IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
import { IWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent } from 'vs/platform/label/common/label';
import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
import { match } from 'vs/base/common/glob';
@@ -191,7 +191,7 @@ export class LabelService extends Disposable implements ILabelService {
}
// Workspace: Single Folder
if (isSingleFolderWorkspaceIdentifier(workspace)) {
if (URI.isUri(workspace)) {
// Folder on disk
const label = options && options.verbose ? this.getUriLabel(workspace) : basename(workspace) || '/';
return this.appendWorkspaceSuffix(label, workspace);