Skip to content

Fix #71987 #72024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrieken merged 1 commit into from
Apr 10, 2019
Merged

Fix #71987 #72024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {

static configName = 'editor.defaultFormatter';

static extensionIds: string[] = [];
static extensionIds: (string | null)[] = [];
static extensionDescriptions: string[] = [];

constructor(
Expand All @@ -60,6 +60,10 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {

DefaultFormatter.extensionIds.length = 0;
DefaultFormatter.extensionDescriptions.length = 0;

DefaultFormatter.extensionIds.push(null);
DefaultFormatter.extensionDescriptions.push(nls.localize('nullFormatterDescription', "None"));

for (const extension of extensions) {
if (extension.main) {
DefaultFormatter.extensionIds.push(extension.identifier.value);
Expand Down Expand Up @@ -156,7 +160,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
properties: {
[DefaultFormatter.configName]: {
description: nls.localize('formatter.default', "Defines a default formatter which takes precedence over all other formatter settings. Must be the identifier of an extension contributing a formatter."),
type: 'string',
type: ['string', 'null'],
default: null,
enum: DefaultFormatter.extensionIds,
markdownEnumDescriptions: DefaultFormatter.extensionDescriptions
Expand Down