From 78adc337e2b7da05553ce6eb2e8e11ba06b67ad4 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 24 Jun 2016 11:40:25 +0200 Subject: [PATCH] #7974 - Support old action to show errors and warnings --- .../markers/browser/markersPanelActions.ts | 24 ++++++++++++++++++- .../browser/markersWorkbenchContributions.ts | 7 ++++-- .../parts/markers/common/messages.ts | 2 ++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts index b79ef799aa0..ce2c4ede600 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts @@ -19,7 +19,7 @@ import Constants from 'vs/workbench/parts/markers/common/constants'; import { FilterOptions } from 'vs/workbench/parts/markers/common/markersModel'; import { MarkersPanel } from 'vs/workbench/parts/markers/browser/markersPanel'; import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; +import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { CollapseAllAction as TreeCollapseAction } from 'vs/base/parts/tree/browser/treeDefaults'; @@ -47,6 +47,28 @@ export class ToggleProblemsPanelAction extends TogglePanelAction { } } +export class ToggleErrorsAndWarningsAction extends TogglePanelAction { + + public static ID:string = 'workbench.action.showErrorsWarnings'; + + constructor(id: string, label: string, + @IPartService private partService: IPartService, + @IPanelService panelService: IPanelService, + @IWorkbenchEditorService editorService: IWorkbenchEditorService, + @ITelemetryService private telemetryService: ITelemetryService + ) { + super(id, label, Constants.MARKERS_PANEL_ID, panelService, editorService); + } + + public run(): TPromise { + let promise= super.run(); + if (this.isPanelFocussed()) { + this.telemetryService.publicLog('problems.used'); + } + return promise; + } +} + export class CollapseAllAction extends TreeCollapseAction { constructor(viewer: Tree.ITree, enabled: boolean, diff --git a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts index a50f265870e..cf98dd41aa7 100644 --- a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts +++ b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts @@ -38,11 +38,14 @@ export function registerContributions(): void { 'markersPanel' )); - platform.Registry.as(ActionExtensions.WorkbenchActions).registerWorkbenchAction(new SyncActionDescriptor( - problemsPanelActions.ToggleProblemsPanelAction, problemsPanelActions.ToggleProblemsPanelAction.ID, Messages.MARKERS_PANEL_TOGGLE_LABEL, { + let registry = platform.Registry.as(ActionExtensions.WorkbenchActions); + + registry.registerWorkbenchAction(new SyncActionDescriptor(problemsPanelActions.ToggleProblemsPanelAction, problemsPanelActions.ToggleProblemsPanelAction.ID, Messages.MARKERS_PANEL_TOGGLE_LABEL, { primary: null, win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M }, linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M }, mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M } }), 'View: ' + Messages.MARKERS_PANEL_TOGGLE_LABEL, Messages.MARKERS_PANEL_VIEW_CATEGORY); + + registry.registerWorkbenchAction(new SyncActionDescriptor(problemsPanelActions.ToggleErrorsAndWarningsAction, problemsPanelActions.ToggleErrorsAndWarningsAction.ID, Messages.MARKERS_PANEL_TOGGLE_LABEL), Messages.SHOW_ERRORS_WARNINGS_ACTION_LABEL); } \ No newline at end of file diff --git a/src/vs/workbench/parts/markers/common/messages.ts b/src/vs/workbench/parts/markers/common/messages.ts index d53d9251098..68d6ee194d7 100644 --- a/src/vs/workbench/parts/markers/common/messages.ts +++ b/src/vs/workbench/parts/markers/common/messages.ts @@ -57,4 +57,6 @@ export default class Messages { : nls.localize('problems.tree.aria.label.marker.nosource', "Problem: {0} at line {1} and column {2}", marker.message, marker.startLineNumber, marker.startColumn); } } + + public static SHOW_ERRORS_WARNINGS_ACTION_LABEL:string= nls.localize('errors.warnings.show.label', "Errors and Warnings"); } \ No newline at end of file -- GitLab