mirror of
https://github.com/Microsoft/vscode
synced 2024-10-13 14:57:14 +00:00
Merge pull request #73535 from Acid147:master
Preselect default formatter
This commit is contained in:
commit
21d9fa7c9d
|
@ -201,19 +201,29 @@ async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel,
|
|||
const overrides = { resource: model.uri, overrideIdentifier: model.getModeId() };
|
||||
const defaultFormatter = configService.getValue<string>(DefaultFormatter.configName, overrides);
|
||||
|
||||
let autoFocusPick;
|
||||
|
||||
const picks = formatters.map((provider, index) => {
|
||||
return <IIndexedPick>{
|
||||
const isDefault = ExtensionIdentifier.equals(provider.extensionId, defaultFormatter);
|
||||
const pick = <IIndexedPick>{
|
||||
index,
|
||||
label: provider.displayName || '',
|
||||
description: ExtensionIdentifier.equals(provider.extensionId, defaultFormatter) ? nls.localize('def', "(default)") : undefined,
|
||||
description: isDefault ? nls.localize('def', "(default)") : undefined,
|
||||
};
|
||||
|
||||
if (isDefault) {
|
||||
// autofocus default pick
|
||||
autoFocusPick = pick;
|
||||
}
|
||||
|
||||
return pick;
|
||||
});
|
||||
|
||||
const configurePick: IQuickPickItem = {
|
||||
label: nls.localize('config', "Configure Default Formatter...")
|
||||
};
|
||||
|
||||
const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], { placeHolder: nls.localize('format.placeHolder', "Select a formatter") });
|
||||
const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], { placeHolder: nls.localize('format.placeHolder', "Select a formatter"), activeItem: autoFocusPick });
|
||||
if (!pick) {
|
||||
// dismissed
|
||||
return undefined;
|
||||
|
|
Loading…
Reference in a new issue