From 6bb0ffb66e81fcf9fae577fe783220639f8cd69f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 3 Jul 2019 15:42:09 -0700
Subject: [PATCH] Use Mutable disposable

---
 src/vs/base/browser/ui/toolbar/toolbar.ts | 30 ++++++-----------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index b77753855ab..4aa201e1a68 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -9,7 +9,7 @@ import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, ActionsOrientation, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuProvider, DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdown';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
 import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { withNullAsUndefined } from 'vs/base/common/types';
 
@@ -32,7 +32,7 @@ export class ToolBar extends Disposable {
 	private options: IToolBarOptions;
 	private actionBar: ActionBar;
 	private toggleMenuAction: ToggleMenuAction;
-	private toggleMenuActionViewItem?: DropdownMenuActionViewItem;
+	private toggleMenuActionViewItem = this._register(new MutableDisposable<DropdownMenuActionViewItem>());
 	private hasSecondaryActions: boolean;
 	private lookupKeybindings: boolean;
 
@@ -42,7 +42,7 @@ export class ToolBar extends Disposable {
 		this.options = options;
 		this.lookupKeybindings = typeof this.options.getKeyBinding === 'function';
 
-		this.toggleMenuAction = this._register(new ToggleMenuAction(() => this.toggleMenuActionViewItem && this.toggleMenuActionViewItem.show(), options.toggleMenuTitle));
+		this.toggleMenuAction = this._register(new ToggleMenuAction(() => this.toggleMenuActionViewItem.value && this.toggleMenuActionViewItem.value.show(), options.toggleMenuTitle));
 
 		let element = document.createElement('div');
 		element.className = 'monaco-toolbar';
@@ -57,13 +57,8 @@ export class ToolBar extends Disposable {
 				// Return special action item for the toggle menu action
 				if (action.id === ToggleMenuAction.ID) {
 
-					// Dispose old
-					if (this.toggleMenuActionViewItem) {
-						this.toggleMenuActionViewItem.dispose();
-					}
-
 					// Create new
-					this.toggleMenuActionViewItem = new DropdownMenuActionViewItem(
+					this.toggleMenuActionViewItem.value = new DropdownMenuActionViewItem(
 						action,
 						(<ToggleMenuAction>action).menuActions,
 						contextMenuProvider,
@@ -73,9 +68,9 @@ export class ToolBar extends Disposable {
 						'toolbar-toggle-more',
 						this.options.anchorAlignmentProvider
 					);
-					this.toggleMenuActionViewItem!.setActionContext(this.actionBar.context);
+					this.toggleMenuActionViewItem.value.setActionContext(this.actionBar.context);
 
-					return this.toggleMenuActionViewItem;
+					return this.toggleMenuActionViewItem.value;
 				}
 
 				return options.actionViewItemProvider ? options.actionViewItemProvider(action) : undefined;
@@ -93,8 +88,8 @@ export class ToolBar extends Disposable {
 
 	set context(context: any) {
 		this.actionBar.context = context;
-		if (this.toggleMenuActionViewItem) {
-			this.toggleMenuActionViewItem.setActionContext(context);
+		if (this.toggleMenuActionViewItem.value) {
+			this.toggleMenuActionViewItem.value.setActionContext(context);
 		}
 	}
 
@@ -154,15 +149,6 @@ export class ToolBar extends Disposable {
 			}
 		};
 	}
-
-	dispose(): void {
-		if (this.toggleMenuActionViewItem) {
-			this.toggleMenuActionViewItem.dispose();
-			this.toggleMenuActionViewItem = undefined;
-		}
-
-		super.dispose();
-	}
 }
 
 class ToggleMenuAction extends Action {