label service: workspace suffix has to be explicitly set

This commit is contained in:
isidor
2019-09-03 16:15:11 +02:00
parent e655624145
commit a5a8a28953
2 changed files with 4 additions and 8 deletions

View File

@@ -17,7 +17,6 @@ import { isWindows } from 'vs/base/common/platform';
import { tildify, getPathLabel } from 'vs/base/common/labels';
import { ltrim, endsWith } from 'vs/base/common/strings';
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { Schemas } from 'vs/base/common/network';
import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting } from 'vs/platform/label/common/label';
import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
import { match } from 'vs/base/common/glob';
@@ -283,12 +282,8 @@ export class LabelService implements ILabelService {
}
private appendWorkspaceSuffix(label: string, uri: URI): string {
if (uri.scheme === Schemas.file) {
return label;
}
const formatting = this.findFormatting(uri);
const suffix = formatting && (typeof formatting.workspaceSuffix === 'string') ? formatting.workspaceSuffix : uri.scheme;
const suffix = formatting && (typeof formatting.workspaceSuffix === 'string') ? formatting.workspaceSuffix : undefined;
return suffix ? `${label} [${suffix}]` : label;
}
}