Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-24 11:47:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

have markerFileDecorations in one place

Browse Source
This commit is contained in:
Johannes Rieken
2017-10-10 13:05:04 +02:00
parent d8f20b58eb
commit 7e2d9ee7b3
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/parts/markers/browser/markersFileDecorations.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { IMarkerService } from 'vs/platform/markers/common/markers';
import { IResourceDecorationsService, IDecorationsProvider, IResourceDecoration } from 'vs/workbench/services/decorations/browser/decorations';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -17,6 +17,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import Severity from 'vs/base/common/severity';
import { editorErrorForeground, editorWarningForeground } from 'vs/editor/common/view/editorColorRegistry';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
class MarkersDecorationsProvider implements IDecorationsProvider {
@@ -89,4 +90,17 @@ class MarkersFileDecorations implements IWorkbenchContribution {
}
}
Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(MarkersFileDecorations);
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(MarkersFileDecorations);
Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
'id': 'problems',
'order': 101,
'type': 'object',
'properties': {
'problems.fileDecorations.enabled': {
'description': localize('markers.showOnFile', "Show Errors & Warnings on files and folder."),
'type': 'boolean',
'default': true
}
}
});

17
src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts
View File

@@ -17,9 +17,6 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { MarkersPanel } from 'vs/workbench/parts/markers/browser/markersPanel';
import './markersFileDecorations';
import { localize } from 'vs/nls';
export function registerContributions(): void {
KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -51,20 +48,6 @@ export function registerContributions(): void {
}
});
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
'id': 'problems',
'order': 101,
'type': 'object',
'properties': {
'problems.fileDecorations.enabled': {
'description': localize('markers.showOnFile', "Show Errors & Warnings on files and folder."),
'type': 'boolean',
'default': true
}
}
});
// markers panel
Registry.as<PanelRegistry>(PanelExtensions.Panels).registerPanel(new PanelDescriptor(

4
src/vs/workbench/parts/markers/markers.contribution.ts
View File

@@ -5,5 +5,7 @@
import { registerContributions } from 'vs/workbench/parts/markers/browser/markersWorkbenchContributions';
import { registerContributions as registerElectronContributions } from 'vs/workbench/parts/markers/electron-browser/markersElectronContributions';
import './browser/markersFileDecorations';
registerContributions();
registerElectronContributions();
registerElectronContributions();