From 6090e7173f48ab58d789af83c2d1f903cf7ff118 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 Apr 2019 12:13:20 +0200 Subject: [PATCH] properly check picked formatter, #71988 --- .../workbench/contrib/format/browser/formatActionsMultiple.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts index fe9c131458..7e75be520a 100644 --- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts +++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts @@ -253,7 +253,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction { const model = editor.getModel(); const provider = getRealAndSyntheticDocumentFormattersOrdered(model); const pick = await instaService.invokeFunction(showFormatterPick, model, provider); - if (pick) { + if (typeof pick === 'number') { await instaService.invokeFunction(formatDocumentWithProvider, provider[pick], editor, FormattingMode.Explicit, CancellationToken.None); } logFormatterTelemetry(telemetryService, 'document', provider, typeof pick === 'number' && provider[pick] || undefined); @@ -291,7 +291,7 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction { const provider = DocumentRangeFormattingEditProviderRegistry.ordered(model); const pick = await instaService.invokeFunction(showFormatterPick, model, provider); - if (pick) { + if (typeof pick === 'number') { await instaService.invokeFunction(formatDocumentRangeWithProvider, provider[pick], editor, range, CancellationToken.None); }