diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts index bde709432cee9..4f96bab363552 100644 --- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts +++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts @@ -97,7 +97,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi return this.hide(); } - const actions = DebugActionsWidget.getActions(this.allActions, this.toUnbind, false, this.debugService, this.keybindingService, this.instantiationService); + const actions = DebugActionsWidget.getActions(this.allActions, this.toUnbind, this.debugService, this.keybindingService, this.instantiationService); if (!arrays.equals(actions, this.activeActions, (first, second) => first.id === second.id)) { this.actionBar.clear(); this.actionBar.push(actions, { icon: true, label: false }); @@ -242,7 +242,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi this.$el.hide(); } - public static getActions(allActions: AbstractDebugAction[], toUnbind: IDisposable[], ignoreFocusSessionAction: boolean, debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] { + public static getActions(allActions: AbstractDebugAction[], toUnbind: IDisposable[], debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] { if (allActions.length === 0) { allActions.push(new ContinueAction(ContinueAction.ID, ContinueAction.LABEL, debugService, keybindingService)); allActions.push(new PauseAction(PauseAction.ID, PauseAction.LABEL, debugService, keybindingService)); @@ -254,9 +254,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi allActions.push(instantiationService.createInstance(RestartAction, RestartAction.ID, RestartAction.LABEL)); allActions.push(new StepBackAction(StepBackAction.ID, StepBackAction.LABEL, debugService, keybindingService)); allActions.push(new ReverseContinueAction(ReverseContinueAction.ID, ReverseContinueAction.LABEL, debugService, keybindingService)); - if (!ignoreFocusSessionAction) { - allActions.push(instantiationService.createInstance(FocusSessionAction, FocusSessionAction.ID, FocusSessionAction.LABEL)); - } + allActions.push(instantiationService.createInstance(FocusSessionAction, FocusSessionAction.ID, FocusSessionAction.LABEL)); allActions.forEach(a => { toUnbind.push(a); }); diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts index 99e1d5f2d29a1..abbf71ac2c45d 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts @@ -107,7 +107,7 @@ export class DebugViewlet extends PersistentViewsViewlet { return [this.startAction, this.configureAction, this.toggleReplAction]; } - return DebugActionsWidget.getActions(this.allActions, this.toUnbind, true, this.debugService, this.keybindingService, this.instantiationService); + return DebugActionsWidget.getActions(this.allActions, this.toUnbind, this.debugService, this.keybindingService, this.instantiationService); } public get showInitialDebugActions(): boolean {