From 56304bd621166e8c644166b59a9b2a04e62ffcdb Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 16 Oct 2019 14:10:28 -0700 Subject: [PATCH] Remove some casts This cast was hiding a potential bug where extensionId was being used as a string --- .../contrib/format/browser/formatActionsMultiple.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts index 8142c039ed6..9770d95f8cf 100644 --- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts +++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts @@ -126,10 +126,10 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution { } private async _pickAndPersistDefaultFormatter(formatter: T[], document: ITextModel): Promise { - const picks = formatter.map((formatter, index) => { - return { + const picks = formatter.map((formatter, index): IIndexedPick => { + return { index, - label: formatter.displayName || formatter.extensionId || '?', + label: formatter.displayName || (formatter.extensionId ? formatter.extensionId.value : '?'), description: formatter.extensionId && formatter.extensionId.value }; }); @@ -203,7 +203,7 @@ async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel, const picks = formatters.map((provider, index) => { const isDefault = ExtensionIdentifier.equals(provider.extensionId, defaultFormatter); - const pick = { + const pick: IIndexedPick = { index, label: provider.displayName || '', description: isDefault ? nls.localize('def', "(default)") : undefined, -- GitLab