ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 01:20:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { ITextModel } from 'vs/editor/common/model';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
import { IModeService } from 'vs/editor/common/services/modeService';
import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
import { ILabelService } from 'vs/platform/label/common/label';
import { IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -46,7 +45,6 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
@INotificationService private readonly _notificationService: INotificationService,
@IQuickInputService private readonly _quickInputService: IQuickInputService,
@IModeService private readonly _modeService: IModeService,
@IStatusbarService private readonly _statusbarService: IStatusbarService,
@ILabelService private readonly _labelService: ILabelService,
) {
super();
@@ -97,7 +95,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
// formatter does not target this file
const label = this._labelService.getUriLabel(document.uri, { relative: true });
const message = nls.localize('miss', "Extension '{0}' cannot format '{1}'", extension.displayName || extension.name, label);
this._statusbarService.setStatusMessage(message, 4000);
this._notificationService.status(message, { hideAfter: 4000 });
return undefined;
}
} else if (formatter.length === 1) {