From c8e7f34ec86a0b86cac2d8acc3145d3e34dec5aa Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 23 Sep 2016 16:56:45 +0200 Subject: [PATCH] do not change ids of actions - can break people --- src/vs/code/electron-main/menus.ts | 2 +- .../parts/debug/electron-browser/debug.contribution.ts | 2 +- src/vs/workbench/parts/markers/browser/markersPanelActions.ts | 2 ++ .../parts/markers/browser/markersWorkbenchContributions.ts | 2 +- src/vs/workbench/parts/output/browser/outputActions.ts | 2 +- .../parts/terminal/electron-browser/terminalActions.ts | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index 5f0f989a68e..f7775e1c8f1 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -496,7 +496,7 @@ export class VSCodeMenu { const debug = this.createMenuItem(nls.localize({ key: 'miViewDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug"), 'workbench.view.debug'); const extensions = this.createMenuItem(nls.localize({ key: 'miViewExtensions', comment: ['&& denotes a mnemonic'] }, "E&&xtensions"), 'workbench.view.extensions'); const output = this.createMenuItem(nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output"), 'workbench.action.output.toggleOutput'); - const debugConsole = this.createMenuItem(nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console"), 'workbench.panel.repl'); + const debugConsole = this.createMenuItem(nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console"), 'workbench.debug.action.toggleRepl'); const integratedTerminal = this.createMenuItem(nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal"), 'workbench.action.terminal.toggleTerminal'); const problems = this.createMenuItem(nls.localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems"), 'workbench.actions.view.problems'); diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts index 4d3eb018173..bf430840d75 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts @@ -54,7 +54,7 @@ class OpenDebugViewletAction extends viewlet.ToggleViewletAction { } class OpenDebugPanelAction extends panel.TogglePanelAction { - public static ID = debug.REPL_ID; + public static ID = 'workbench.debug.action.toggleRepl'; public static LABEL = nls.localize('toggleDebugPanel', "Debug Console"); constructor( diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts index 28f7f708e8d..514fb267a9d 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts @@ -26,6 +26,8 @@ import Tree = require('vs/base/parts/tree/browser/tree'); export class ToggleMarkersPanelAction extends TogglePanelAction { + public static ID = 'workbench.actions.view.problems'; + constructor(id: string, label: string, @IPartService partService: IPartService, @IPanelService panelService: IPanelService, diff --git a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts index 2274900e0d4..1c935d0929d 100644 --- a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts +++ b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts @@ -40,7 +40,7 @@ export function registerContributions(): void { let registry = platform.Registry.as(ActionExtensions.WorkbenchActions); - registry.registerWorkbenchAction(new SyncActionDescriptor(markersPanelActions.ToggleMarkersPanelAction, Constants.MARKERS_PANEL_ID, Messages.MARKERS_PANEL_TOGGLE_LABEL, { + registry.registerWorkbenchAction(new SyncActionDescriptor(markersPanelActions.ToggleMarkersPanelAction, markersPanelActions.ToggleMarkersPanelAction.ID, Messages.MARKERS_PANEL_TOGGLE_LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M }), 'View: ' + Messages.MARKERS_PANEL_TOGGLE_LABEL, Messages.MARKERS_PANEL_VIEW_CATEGORY); diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts index 9db006d569a..e78b22885f5 100644 --- a/src/vs/workbench/parts/output/browser/outputActions.ts +++ b/src/vs/workbench/parts/output/browser/outputActions.ts @@ -15,7 +15,7 @@ import {IPanelService} from 'vs/workbench/services/panel/common/panelService'; export class ToggleOutputAction extends Action { - public static ID = OUTPUT_PANEL_ID; + public static ID = 'workbench.action.output.toggleOutput'; public static LABEL = nls.localize('toggleOutput', "Toggle Output"); constructor( diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index 1fff93ec267..05068fbb4d7 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -8,13 +8,13 @@ import os = require('os'); import { Action, IAction } from 'vs/base/common/actions'; import { EndOfLinePreference } from 'vs/editor/common/editorCommon'; import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; -import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/electron-browser/terminal'; +import { ITerminalService } from 'vs/workbench/parts/terminal/electron-browser/terminal'; import { SelectActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { TPromise } from 'vs/base/common/winjs.base'; export class ToggleTerminalAction extends Action { - public static ID = TERMINAL_PANEL_ID; + public static ID = 'workbench.action.terminal.toggleTerminal'; public static LABEL = nls.localize('workbench.action.terminal.toggleTerminal', "Toggle Integrated Terminal"); constructor(