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

labels - help to resolve workspace folder in case resource scheme mismatch (#151591)

Browse Source
This commit is contained in:
Benjamin Pasero
2022-06-09 10:52:13 +02:00
committed by GitHub
parent 54ae4d8ccb
commit 4eb0e71ee4
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
import { Schemas } from 'vs/base/common/network';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { Memento } from 'vs/workbench/common/memento';
import { firstOrDefault } from 'vs/base/common/arrays';
const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint<ResourceLabelFormatter[]>({
extensionPoint: 'resourceLabelFormatters',
@@ -223,8 +224,23 @@ export class LabelService extends Disposable implements ILabelService {
}
// Relative label
if (options.relative) {
const folder = this.contextService?.getWorkspaceFolder(resource);
if (options.relative && this.contextService) {
let folder = this.contextService.getWorkspaceFolder(resource);
if (!folder) {
// It is possible that the resource we want to resolve the
// workspace folder for is not using the same scheme as
// the folders in the workspace, so we help by trying again
// to resolve a workspace folder by trying again with a
// scheme that is workspace contained.
const workspace = this.contextService.getWorkspace();
const firstFolder = firstOrDefault(workspace.folders);
if (firstFolder && resource.scheme !== firstFolder.uri.scheme && resource.path.startsWith(posix.sep)) {
folder = this.contextService.getWorkspaceFolder(firstFolder.uri.with({ path: resource.path }));
}
}
if (folder) {
const folderLabel = this.formatUri(folder.uri, formatting, options.noPrefix);