提交 742c2998 编写于 作者: I isidor

actionBar: always dispose action items for now. Debug always recreate focusProcessActionItem

#23822
上级 1798d262
...@@ -554,8 +554,7 @@ export class ActionBar extends EventEmitter implements IActionRunner { ...@@ -554,8 +554,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
} }
public clear(): void { public clear(): void {
// Do not dispose action items if they were provided from outside this.items = lifecycle.dispose(this.items);
this.items = this.options.actionItemProvider ? [] : lifecycle.dispose(this.items);
$(this.actionsList).empty(); $(this.actionsList).empty();
} }
...@@ -670,7 +669,7 @@ export class ActionBar extends EventEmitter implements IActionRunner { ...@@ -670,7 +669,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
public dispose(): void { public dispose(): void {
if (this.items !== null) { if (this.items !== null) {
lifecycle.dispose(this.items); this.clear();
} }
this.items = null; this.items = null;
......
...@@ -52,7 +52,6 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi ...@@ -52,7 +52,6 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
private isVisible: boolean; private isVisible: boolean;
private isBuilt: boolean; private isBuilt: boolean;
private focusProcessActionItem: FocusProcessActionItem;
constructor( constructor(
@IMessageService private messageService: IMessageService, @IMessageService private messageService: IMessageService,
...@@ -79,12 +78,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi ...@@ -79,12 +78,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
orientation: ActionsOrientation.HORIZONTAL, orientation: ActionsOrientation.HORIZONTAL,
actionItemProvider: (action: IAction) => { actionItemProvider: (action: IAction) => {
if (action.id === FocusProcessAction.ID) { if (action.id === FocusProcessAction.ID) {
if (!this.focusProcessActionItem) { return this.instantiationService.createInstance(FocusProcessActionItem, action);
this.focusProcessActionItem = this.instantiationService.createInstance(FocusProcessActionItem, action);
this.toDispose.push(this.focusProcessActionItem);
}
return this.focusProcessActionItem;
} }
return null; return null;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册