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

show notification when formatter is disabled/uninstalled, message otherwise

Browse Source
This commit is contained in:
Johannes Rieken
2019-04-01 10:39:58 +02:00
committed by Karl Burtram
parent 61f7f19d12
commit 82b8750b63
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
import { Disposable } from 'vs/base/common/lifecycle'; import { Disposable } from 'vs/base/common/lifecycle';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ITextModel } from 'vs/editor/common/model'; import { ITextModel } from 'vs/editor/common/model';
@@ -28,6 +28,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
import { IModeService } from 'vs/editor/common/services/modeService'; import { IModeService } from 'vs/editor/common/services/modeService';
import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
import { ILabelService } from 'vs/platform/label/common/label'; import { ILabelService } from 'vs/platform/label/common/label';
import { IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
type FormattingEditProvider = DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider; type FormattingEditProvider = DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider;
@@ -40,6 +41,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
constructor( constructor(
@IExtensionService private readonly _extensionService: IExtensionService, @IExtensionService private readonly _extensionService: IExtensionService,
@IExtensionEnablementService private readonly _extensionEnablementService: IExtensionEnablementService,
@IConfigurationService private readonly _configService: IConfigurationService, @IConfigurationService private readonly _configService: IConfigurationService,
@INotificationService private readonly _notificationService: INotificationService, @INotificationService private readonly _notificationService: INotificationService,
@IQuickInputService private readonly _quickInputService: IQuickInputService, @IQuickInputService private readonly _quickInputService: IQuickInputService,
@@ -83,18 +85,17 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
if (defaultFormatter) { if (defaultFormatter) {
// formatter available // formatter available
return defaultFormatter; return defaultFormatter;
}
} else { // bad -> formatter gone
// formatter gone const extension = await this._extensionService.getExtension(defaultFormatterId);
const extension = await this._extensionService.getExtension(defaultFormatterId); if (extension && this._extensionEnablementService.isEnabled(toExtension(extension))) {
// formatter does not target this file
const label = this._labelService.getUriLabel(document.uri, { relative: true }); const label = this._labelService.getUriLabel(document.uri, { relative: true });
const message = extension const message = nls.localize('miss', "Extension '{0}' cannot format '{1}'", extension.displayName || extension.name, label);
? nls.localize('miss', "Extension '{0}' cannot format '{1}'", extension.displayName || extension.name, label)
: nls.localize('gone', "Extension '{0}' is configured as formatter but not available", defaultFormatterId);
this._statusbarService.setStatusMessage(message, 4000); this._statusbarService.setStatusMessage(message, 4000);
return undefined; return undefined;
} }
} else if (formatter.length === 1) { } else if (formatter.length === 1) {
// ok -> nothing configured but only one formatter available // ok -> nothing configured but only one formatter available
return formatter[0]; return formatter[0];
@@ -102,7 +103,9 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId(); const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId();
const silent = mode === FormattingMode.Silent; const silent = mode === FormattingMode.Silent;
const message = nls.localize('config.needed', "There are multiple formatters for {0}-files. Select a default formatter to continue.", DefaultFormatter._maybeQuotes(langName)); const message = !defaultFormatterId
? nls.localize('config.needed', "There are multiple formatters for {0}-files. Select a default formatter to continue.", DefaultFormatter._maybeQuotes(langName))
: nls.localize('config.bad', "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.", defaultFormatterId);
return new Promise<T | undefined>((resolve, reject) => { return new Promise<T | undefined>((resolve, reject) => {
this._notificationService.prompt( this._notificationService.prompt(