Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Isidorn/action items lifecycle fixes #23822 #23889

Merged
merged 3 commits into from Apr 4, 2017
Merged

Isidorn/action items lifecycle fixes #23822 #23889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30abd0b
actionBar: always dispose action items for now.
isidorn Apr 4, 2017
1d2268e
debug: do not cache action items
isidorn Apr 4, 2017
06a9bac
do not clear list, just dispose as before
isidorn Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/vs/base/browser/ui/actionbar/actionbar.ts
View file
Open in desktop
Expand Up @@ -554,8 +554,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
}

public clear(): void {
// Do not dispose action items if they were provided from outside
this.items = this.options.actionItemProvider ? [] : lifecycle.dispose(this.items);
this.items = lifecycle.dispose(this.items);
$(this.actionsList).empty();
}

Expand Down
10 changes: 2 additions & 8 deletions src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
View file
Open in desktop
Expand Up @@ -52,7 +52,6 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi

private isVisible: boolean;
private isBuilt: boolean;
private focusProcessActionItem: FocusProcessActionItem;

constructor(
@IMessageService private messageService: IMessageService,
Expand All @@ -79,12 +78,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
orientation: ActionsOrientation.HORIZONTAL,
actionItemProvider: (action: IAction) => {
if (action.id === FocusProcessAction.ID) {
if (!this.focusProcessActionItem) {
this.focusProcessActionItem = this.instantiationService.createInstance(FocusProcessActionItem, action);
this.toDispose.push(this.focusProcessActionItem);
}

return this.focusProcessActionItem;
return this.instantiationService.createInstance(FocusProcessActionItem, action);
}

return null;
Expand Down Expand Up @@ -271,4 +265,4 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
delete this.$el;
}
}
}
}
5 changes: 1 addition & 4 deletions src/vs/workbench/parts/debug/browser/debugViewlet.ts
View file
Open in desktop
Expand Up @@ -131,10 +131,7 @@ export class DebugViewlet extends Viewlet {

public getActionItem(action: IAction): IActionItem {
if (action.id === StartAction.ID && this.contextService.getWorkspace()) {
if (!this.startDebugActionItem) {
this.startDebugActionItem = this.instantiationService.createInstance(StartDebugActionItem, null, action);
}

this.startDebugActionItem = this.instantiationService.createInstance(StartDebugActionItem, null, action);
return this.startDebugActionItem;
}

Expand Down