development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workspace folder picker entry descriptions are suboptimal for some filesystems (fix #183418) (#184018)

Browse source
This commit is contained in:
Benjamin Pasero 2023-06-01 09:01:56 +02:00 committed by GitHub
parent c3867859cf
commit fbbcd0ea14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file

@ -1721,14 +1721,19 @@ async function pickTerminalCwd(accessor: ServicesAccessor, cancel?: Cancellation
}
type Item = IQuickPickItem & { pair: WorkspaceFolderCwdPair };
const folderPicks: Item[] = shrinkedPairs.map(pair => ({
label: pair.folder.name,
description: pair.isOverridden
const folderPicks: Item[] = shrinkedPairs.map(pair => {
const label = pair.folder.name;
const description = pair.isOverridden
? localize('workbench.action.terminal.overriddenCwdDescription', "(Overriden) {0}", labelService.getUriLabel(pair.cwd, { relative: !pair.isAbsolute }))
: labelService.getUriLabel(dirname(pair.cwd), { relative: true }),
pair: pair,
iconClasses: getIconClasses(modelService, languageService, pair.cwd, FileKind.ROOT_FOLDER)
}));
: labelService.getUriLabel(dirname(pair.cwd), { relative: true });
return {
label,
description: description !== label ? description : undefined,
pair: pair,
iconClasses: getIconClasses(modelService, languageService, pair.cwd, FileKind.ROOT_FOLDER)
};
});
const options: IPickOptions<Item> = {
placeHolder: localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal"),
matchOnDescription: true,