ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

properly check picked formatter, #71988

Browse Source
This commit is contained in:
Johannes Rieken
2019-04-09 12:13:20 +02:00
committed by Karl Burtram
parent 7ebf746584
commit 6090e7173f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
View File

@@ -253,7 +253,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
const model = editor.getModel(); const model = editor.getModel();
const provider = getRealAndSyntheticDocumentFormattersOrdered(model); const provider = getRealAndSyntheticDocumentFormattersOrdered(model);
const pick = await instaService.invokeFunction(showFormatterPick, model, provider); 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); await instaService.invokeFunction(formatDocumentWithProvider, provider[pick], editor, FormattingMode.Explicit, CancellationToken.None);
} }
logFormatterTelemetry(telemetryService, 'document', provider, typeof pick === 'number' && provider[pick] || undefined); 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 provider = DocumentRangeFormattingEditProviderRegistry.ordered(model);
const pick = await instaService.invokeFunction(showFormatterPick, model, provider); const pick = await instaService.invokeFunction(showFormatterPick, model, provider);
if (pick) { if (typeof pick === 'number') {
await instaService.invokeFunction(formatDocumentRangeWithProvider, provider[pick], editor, range, CancellationToken.None); await instaService.invokeFunction(formatDocumentRangeWithProvider, provider[pick], editor, range, CancellationToken.None);
} }