Skip to content

Commit fbbcd0e

Browse files
authored
Workspace folder picker entry descriptions are suboptimal for some filesystems (fix microsoft#183418) (microsoft#184018)
1 parent c386785 commit fbbcd0e

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,14 +1721,19 @@ async function pickTerminalCwd(accessor: ServicesAccessor, cancel?: Cancellation
17211721
}
17221722

17231723
type Item = IQuickPickItem & { pair: WorkspaceFolderCwdPair };
1724-
const folderPicks: Item[] = shrinkedPairs.map(pair => ({
1725-
label: pair.folder.name,
1726-
description: pair.isOverridden
1724+
const folderPicks: Item[] = shrinkedPairs.map(pair => {
1725+
const label = pair.folder.name;
1726+
const description = pair.isOverridden
17271727
? localize('workbench.action.terminal.overriddenCwdDescription', "(Overriden) {0}", labelService.getUriLabel(pair.cwd, { relative: !pair.isAbsolute }))
1728-
: labelService.getUriLabel(dirname(pair.cwd), { relative: true }),
1729-
pair: pair,
1730-
iconClasses: getIconClasses(modelService, languageService, pair.cwd, FileKind.ROOT_FOLDER)
1731-
}));
1728+
: labelService.getUriLabel(dirname(pair.cwd), { relative: true });
1729+
1730+
return {
1731+
label,
1732+
description: description !== label ? description : undefined,
1733+
pair: pair,
1734+
iconClasses: getIconClasses(modelService, languageService, pair.cwd, FileKind.ROOT_FOLDER)
1735+
};
1736+
});
17321737
const options: IPickOptions<Item> = {
17331738
placeHolder: localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal"),
17341739
matchOnDescription: true,

0 commit comments

Comments
 (0)