diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts index 0b6ef5a245a..ffbc3b0dfde 100644 --- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts +++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts @@ -201,19 +201,29 @@ async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel, const overrides = { resource: model.uri, overrideIdentifier: model.getModeId() }; const defaultFormatter = configService.getValue(DefaultFormatter.configName, overrides); + let autoFocusPick; + const picks = formatters.map((provider, index) => { - return { + const isDefault = ExtensionIdentifier.equals(provider.extensionId, defaultFormatter); + const pick = { 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;