remove configure extension buttons, add configure default to format with...

src/vs/workbench/contrib/format/browser/format.contribution.ts

@@ -3,6 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/format.contribution';
 import './formatActionsMultiple';
 import './formatActionsNone';

src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts

@@ -9,7 +9,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { DocumentRangeFormattingEditProviderRegistry, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from 'vs/editor/common/modes';
 import * as nls from 'vs/nls';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IQuickInputService, IQuickPickItem, IQuickInputButton } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { formatDocumentRangeWithProvider, formatDocumentWithProvider, getRealAndSyntheticDocumentFormattersOrdered, FormattingConflicts, FormattingMode } from 'vs/editor/contrib/format/format';
@@ -27,6 +27,8 @@ import { ITextModel } from 'vs/editor/common/model';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IModeService } from 'vs/editor/common/services/modeService';
 
+type FormattingEditProvider = DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider;
+
 class DefaultFormatter extends Disposable implements IWorkbenchContribution {
 
 	static configName = 'editor.defaultFormatter';
@@ -58,11 +60,11 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
 		}
 	}
 
-	private static _maybeQuotes(s: string): string {
+	static _maybeQuotes(s: string): string {
 		return s.match(/\s/) ? `'${s}'` : s;
 	}
 
-	private async _selectFormatter<T extends DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider>(formatter: T[], document: ITextModel, mode: FormattingMode): Promise<T | undefined> {
+	private async _selectFormatter<T extends FormattingEditProvider>(formatter: T[], document: ITextModel, mode: FormattingMode): Promise<T | undefined> {
 
 		const defaultFormatterId = this._configService.getValue<string>(DefaultFormatter.configName, {
 			resource: document.uri,
@@ -99,7 +101,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
 		});
 	}
 
-	private async _pickAndPersistDefaultFormatter<T extends DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider>(formatter: T[], document: ITextModel): Promise<T | undefined> {
+	private async _pickAndPersistDefaultFormatter<T extends FormattingEditProvider>(formatter: T[], document: ITextModel): Promise<T | undefined> {
 		const picks = formatter.map((formatter, index) => {
 			return <IIndexedPick>{
 				index,
@@ -143,11 +145,6 @@ interface IIndexedPick extends IQuickPickItem {
 	index: number;
 }
 
-const openExtensionAction: IQuickInputButton = {
-	tooltip: nls.localize('show.ext', "Show extension..."),
-	iconClass: 'format-show-extension'
-};
-
 function logFormatterTelemetry<T extends { extensionId?: ExtensionIdentifier }>(telemetryService: ITelemetryService, mode: 'document' | 'range', options: T[], pick?: T) {
 
 	function extKey(obj: T): string {
@@ -168,6 +165,47 @@ function logFormatterTelemetry<T extends { extensionId?: ExtensionIdentifier }>(
 	});
 }
 
+async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel, formatters: FormattingEditProvider[]): Promise<number | undefined> {
+	const quickPickService = accessor.get(IQuickInputService);
+	const configService = accessor.get(IConfigurationService);
+	const modeService = accessor.get(IModeService);
+
+	const overrides = { resource: model.uri, overrideIdentifier: model.getModeId() };
+	const defaultFormatter = configService.getValue<string>(DefaultFormatter.configName, overrides);
+
+	const picks = formatters.map((provider, index) => {
+		return <IIndexedPick>{
+			index,
+			label: provider.displayName || '',
+			description: ExtensionIdentifier.equals(provider.extensionId, defaultFormatter) ? nls.localize('def', "(default)") : undefined,
+		};
+	});
+
+	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") });
+	if (!pick) {
+		// dismissed
+		return undefined;
+
+	} else if (pick === configurePick) {
+		// config default
+		const langName = modeService.getLanguageName(model.getModeId()) || model.getModeId();
+		const pick = await quickPickService.pick(picks, { placeHolder: nls.localize('select', "Select a default formatter for {0}-files", DefaultFormatter._maybeQuotes(langName)) });
+		if (pick && formatters[pick.index].extensionId) {
+			configService.updateValue(DefaultFormatter.configName, formatters[pick.index].extensionId!.value, overrides);
+		}
+		return undefined;
+
+	} else {
+		// picked one
+		return (<IIndexedPick>pick).index;
+	}
+
+}
+
 registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 
 	constructor() {
@@ -188,34 +226,14 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 			return;
 		}
 		const instaService = accessor.get(IInstantiationService);
-		const quickPickService = accessor.get(IQuickInputService);
 		const telemetryService = accessor.get(ITelemetryService);
-		const configService = accessor.get(IConfigurationService);
-
 		const model = editor.getModel();
-		const defaultFormatter = configService.getValue<string>(DefaultFormatter.configName, {
-			resource: model.uri,
-			overrideIdentifier: model.getModeId()
-		});
-
 		const provider = getRealAndSyntheticDocumentFormattersOrdered(model);
-		const picks = provider.map((provider, index) => {
-			return <IIndexedPick>{
-				index,
-				label: provider.displayName || '',
-				description: ExtensionIdentifier.equals(provider.extensionId, defaultFormatter) ? nls.localize('def', "(default)") : undefined,
-				buttons: [openExtensionAction]
-			};
-		});
-
-		const pick = await quickPickService.pick(picks, {
-			placeHolder: nls.localize('format.placeHolder', "Select a formatter")
-		});
+		const pick = await instaService.invokeFunction(showFormatterPick, model, provider);
 		if (pick) {
-			await instaService.invokeFunction(formatDocumentWithProvider, provider[pick.index], editor, CancellationToken.None);
+			await instaService.invokeFunction(formatDocumentWithProvider, provider[pick], editor, CancellationToken.None);
 		}
-
-		logFormatterTelemetry(telemetryService, 'document', provider, pick && provider[pick.index]);
+		logFormatterTelemetry(telemetryService, 'document', provider, typeof pick === 'number' && provider[pick] || undefined);
 	}
 });
 
@@ -240,38 +258,20 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
 			return;
 		}
 		const instaService = accessor.get(IInstantiationService);
-		const quickPickService = accessor.get(IQuickInputService);
 		const telemetryService = accessor.get(ITelemetryService);
-		const configService = accessor.get(IConfigurationService);
 
 		const model = editor.getModel();
-		const defaultFormatter = configService.getValue<string>(DefaultFormatter.configName, {
-			resource: model.uri,
-			overrideIdentifier: model.getModeId()
-		});
-
 		let range: Range = editor.getSelection();
 		if (range.isEmpty()) {
 			range = new Range(range.startLineNumber, 1, range.startLineNumber, model.getLineMaxColumn(range.startLineNumber));
 		}
 
 		const provider = DocumentRangeFormattingEditProviderRegistry.ordered(model);
-		const picks = provider.map((provider, index) => {
-			return <IIndexedPick>{
-				index,
-				label: provider.displayName || '',
-				description: ExtensionIdentifier.equals(provider.extensionId, defaultFormatter) ? nls.localize('def', "(default)") : undefined,
-				buttons: [openExtensionAction]
-			};
-		});
-
-		const pick = await quickPickService.pick(picks, {
-			placeHolder: nls.localize('format.placeHolder', "Select a formatter")
-		});
+		const pick = await instaService.invokeFunction(showFormatterPick, model, provider);
 		if (pick) {
-			await instaService.invokeFunction(formatDocumentRangeWithProvider, provider[pick.index], editor, range, CancellationToken.None);
+			await instaService.invokeFunction(formatDocumentRangeWithProvider, provider[pick], editor, range, CancellationToken.None);
 		}
 
-		logFormatterTelemetry(telemetryService, 'range', provider, pick && provider[pick.index]);
+		logFormatterTelemetry(telemetryService, 'range', provider, typeof pick === 'number' && provider[pick] || undefined);
 	}
 });

src/vs/workbench/contrib/format/browser/media/configure-inverse.svg

-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#C5C5C5"><path d="M12.714 9.603c-.07.207-.15.407-.246.601l1.017 2.139c-.335.424-.718.807-1.142 1.143l-2.14-1.018c-.193.097-.394.176-.601.247l-.795 2.235c-.265.03-.534.05-.807.05-.272 0-.541-.02-.806-.05l-.795-2.235c-.207-.071-.408-.15-.602-.247l-2.14 1.017c-.424-.336-.807-.719-1.143-1.143l1.017-2.139c-.094-.193-.175-.393-.245-.6l-2.236-.796c-.03-.265-.05-.534-.05-.807s.02-.542.05-.807l2.236-.795c.07-.207.15-.407.246-.601l-1.016-2.139c.336-.423.719-.807 1.143-1.142l2.14 1.017c.193-.096.394-.176.602-.247l.793-2.236c.265-.03.534-.05.806-.05.273 0 .542.02.808.05l.795 2.236c.207.07.407.15.601.246l2.14-1.017c.424.335.807.719 1.142 1.142l-1.017 2.139c.096.194.176.394.246.601l2.236.795c.029.266.049.535.049.808s-.02.542-.05.807l-2.236.796zm-4.714-4.603c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3z"/><circle cx="8" cy="8" r="1.5"/></g></svg>
\ No newline at end of file

src/vs/workbench/contrib/format/browser/media/configure.svg

-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#424242"><path d="M12.714 9.603c-.07.207-.15.407-.246.601l1.017 2.139c-.335.424-.718.807-1.142 1.143l-2.14-1.018c-.193.097-.394.176-.601.247l-.795 2.235c-.265.03-.534.05-.807.05-.272 0-.541-.02-.806-.05l-.795-2.235c-.207-.071-.408-.15-.602-.247l-2.14 1.017c-.424-.336-.807-.719-1.143-1.143l1.017-2.139c-.094-.193-.175-.393-.245-.6l-2.236-.796c-.03-.265-.05-.534-.05-.807s.02-.542.05-.807l2.236-.795c.07-.207.15-.407.246-.601l-1.016-2.139c.336-.423.719-.807 1.143-1.142l2.14 1.017c.193-.096.394-.176.602-.247l.793-2.236c.265-.03.534-.05.806-.05.273 0 .542.02.808.05l.795 2.236c.207.07.407.15.601.246l2.14-1.017c.424.335.807.719 1.142 1.142l-1.017 2.139c.096.194.176.394.246.601l2.236.795c.029.266.049.535.049.808s-.02.542-.05.807l-2.236.796zm-4.714-4.603c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3z"/><circle cx="8" cy="8" r="1.5"/></g></svg>
\ No newline at end of file

src/vs/workbench/contrib/format/browser/media/format.contribution.css

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .format-show-extension {
-	background-image: url('configure.svg');
-}
-
-.vs-dark .monaco-workbench .format-show-extension,
-.hc-black .monaco-workbench .format-show-extension {
-	background-image: url('configure-inverse.svg');
-}