fix more memory leaks when starting and closing DynamoRevit (#14366)

mjkkirschner · web-flow · commit 88172935ca65 · 2023-09-01T17:39:12.000-04:00
* fix most memory leaks from opening and closing Dynamo Splash Screen (#14344) * fixing mem leaks in progress * fix test and remove todo * attempt to fix dispose issue in docs browser view get rid of redudant try/catch cleanup log event in docs browser extension replace item produced lambda with named method fix broken dispose logic in nodeautocompletesearchcontrol - it was always hanging onto static event implement dispose on viewextensioncommandexec on dynamoviewmodel dispose, also dispose all workspaces - their remove methods are not called... fix entry added lambda in searchviewmodel dynamoview now disposes workspace view and node autocomplete search - TODO here. workspaceview implement idisposable and cleans up view model subscriptions direct manip extension was not cleaning up settings prop changed. graph meta data view was not cleaning up current workspace cleared event attempt to cleanup browser com refs... not sure this is helping * review comment
diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs
@@ -109,24 +109,20 @@ protected virtual void Dispose(bool disposing)
             // Cleanup
             this.viewModel.LinkChanged -= NavigateToPage;
             this.documentationBrowser.NavigationStarting -= ShouldAllowNavigation;
+            this.documentationBrowser.DpiChanged -= DocumentationBrowser_DpiChanged;
+
+            if (this.documentationBrowser.CoreWebView2 != null)
+            {
+                this.documentationBrowser.CoreWebView2.WebMessageReceived -= CoreWebView2OnWebMessageReceived;
+            }
+
             // Note to test writers
             // Disposing the document browser will cause future tests
             // that uses the Browser component to crash
             if (!Models.DynamoModel.IsTestMode)
             {
                 this.documentationBrowser.Dispose();
             }
-            this.documentationBrowser.DpiChanged -= DocumentationBrowser_DpiChanged;
-            try
-            {
-                if (this.documentationBrowser.CoreWebView2 != null)
-                    this.documentationBrowser.CoreWebView2.WebMessageReceived -= CoreWebView2OnWebMessageReceived;
-
-            }
-            catch (Exception)
-            {
-                return;
-            }
         }
 
         async void InitializeAsync()
diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs
@@ -436,6 +436,8 @@ protected virtual void Dispose(bool disposing)
             {
                 this.pmExtension.PackageLoader.PackgeLoaded -= OnPackageLoaded;
             }
+
+            PackageDocumentationManager.Instance.MessageLogged -= OnMessageLogged;
             PackageDocumentationManager.Instance.Dispose();
         }
 
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -873,8 +873,8 @@ protected DynamoModel(IStartConfiguration config)
             if (!IsServiceMode)
             {
                 SearchModel = new NodeSearchModel(Logger);
-                SearchModel.ItemProduced +=
-                    node => ExecuteCommand(new CreateNodeCommand(node, 0, 0, true, true));
+                SearchModel.ItemProduced += SearchModel_ItemProduced;
+                    
             }
 
             NodeFactory = new NodeFactory();
@@ -1021,6 +1021,11 @@ protected DynamoModel(IStartConfiguration config)
             DynamoReady(new ReadyParams(this));
         }
 
+        private void SearchModel_ItemProduced(NodeModel node)
+        {
+            ExecuteCommand(new CreateNodeCommand(node, 0, 0, true, true));
+        }
+
         /// <summary>
         /// It returns a PathManager instance based on the mode in order to reuse it's Singleton instance or create a new one
         /// </summary>
@@ -1476,6 +1481,10 @@ public void Dispose()
                 FeatureFlags.MessageLogged -= LogMessageWrapper;
             }
             DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved -= CheckFeatureFlagTest;
+            if (!IsServiceMode)
+            {
+                SearchModel.ItemProduced -= SearchModel_ItemProduced;
+            }
         }
 
         private void InitializeCustomNodeManager()
@@ -2886,7 +2895,7 @@ public void RemoveWorkspace(WorkspaceModel workspace)
         {
             OnWorkspaceRemoveStarted(workspace);
             if (_workspaces.Remove(workspace))
-            {
+            {   
                 if (workspace is HomeWorkspaceModel)
                 {
                     workspace.Dispose();
diff --git a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
@@ -24,7 +24,7 @@ namespace Dynamo.UI.Controls
     /// Notice this control shares a lot of logic with InCanvasSearchControl for now
     /// But they will diverge eventually because of UI improvements to auto complete.
     /// </summary>
-    public partial class NodeAutoCompleteSearchControl
+    public partial class NodeAutoCompleteSearchControl : IDisposable
     {
         ListBoxItem HighlightedItem;
 
@@ -45,7 +45,10 @@ public NodeAutoCompleteSearchControl()
             if (Application.Current != null)
             {
                 Application.Current.Deactivated += CurrentApplicationDeactivated;
-                Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;
+                if (Application.Current.MainWindow != null)
+                {
+                    Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;
+                }
             }
             HomeWorkspaceModel.WorkspaceClosed += this.CloseAutoCompletion;
         }
@@ -55,8 +58,12 @@ private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.Compon
             if (Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
-                Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;
+                if (Application.Current.MainWindow != null)
+                {
+                    Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;
+                }
             }
+            HomeWorkspaceModel.WorkspaceClosed -= this.CloseAutoCompletion;
         }
 
         private void CurrentApplicationDeactivated(object sender, EventArgs e)
@@ -388,5 +395,10 @@ private void OnSuggestion_Click(object sender, RoutedEventArgs e)
             }
             ViewModel.PopulateAutoCompleteCandidates();
         }
+
+        public void Dispose()
+        {
+            NodeAutoCompleteSearchControl_Unloaded(this,null);
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/Extensions/ViewExtensionCommandExecutive.cs b/src/DynamoCoreWpf/Extensions/ViewExtensionCommandExecutive.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using Dynamo.Extensions;
 using Dynamo.Logging;
 using Dynamo.Models;
@@ -7,14 +7,19 @@
 
 namespace Dynamo.Wpf.Extensions
 {
-    internal class ViewExtensionCommandExecutive : ICommandExecutive
+    internal class ViewExtensionCommandExecutive : ICommandExecutive,IDisposable
     {
         private readonly DynamoViewModel dynamoViewModel;
 
         public ViewExtensionCommandExecutive(DynamoViewModel model)
         {
             dynamoViewModel = model;
-            MessageLogged += (message) => { dynamoViewModel.Model.Logger.Log(message); };
+            MessageLogged += ViewExtensionCommandExecutive_MessageLogged;
+        }
+
+        private void ViewExtensionCommandExecutive_MessageLogged(ILogMessage message)
+        {
+            dynamoViewModel.Model.Logger.Log(message);
         }
 
         public void ExecuteCommand(DynamoModel.RecordableCommand command, string uniqueId, string extensionName)
@@ -42,5 +47,10 @@ private void Log(ILogMessage obj)
             var handler = MessageLogged;
             if (handler != null) handler(obj);
         }
+
+        public void Dispose()
+        {
+            MessageLogged -= ViewExtensionCommandExecutive_MessageLogged;
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs b/src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
@@ -120,7 +120,7 @@ public void AddExtensionMenuItem(MenuItem menuItem)
         /// <returns></returns>
         public void AddToExtensionsSideBar(IViewExtension viewExtension, ContentControl contentControl)
         {
-            bool added  = dynamoView.AddOrFocusExtensionControl(viewExtension, contentControl);
+            bool added = dynamoView.AddOrFocusExtensionControl(viewExtension, contentControl);
 
             if (added)
             {
@@ -223,7 +223,7 @@ public void OpenViewExtension(string extensionName)
         {
             dynamoViewModel.OnViewExtensionOpenRequest(extensionName);
         }
-        
+
         /// <summary>
         /// Event raised when a component inside Dynamo raises a request to open a view extension.
         /// </summary>
@@ -247,6 +247,13 @@ public event Action<string, object> ViewExtensionOpenRequestWithParameter
             remove => dynamoViewModel.ViewExtensionOpenWithParameterRequest -= value;
         }
 
+        public new void Dispose()
+        {
+            if (CommandExecutive is IDisposable disposable)
+            { disposable.Dispose(); }
+            base.Dispose();
+        }
+
     }
     /// <summary>
     /// An enum that represents the different possible 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -3421,6 +3421,10 @@ public bool PerformShutdownSequence(ShutdownParams shutdownParams)
 
 
             BackgroundPreviewViewModel.Dispose();
+            foreach (var wsvm in workspaces)
+            {
+                wsvm.Dispose();
+            }
             MainGuideManager?.CloseRealTimeInfoWindow();
 
             model.ShutDown(shutdownParams.ShutdownHost);
diff --git a/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs
@@ -403,6 +403,7 @@ public override void Dispose()
             {
                 cate.DisposeTree();
             }
+            Model.EntryAdded += AddEntry;
             Model.EntryUpdated -= UpdateEntry;
             Model.EntryRemoved -= RemoveEntry;
 
@@ -425,12 +426,7 @@ private void InitializeCore()
             searchIconAlignment = System.Windows.HorizontalAlignment.Left;
 
             // When Library changes, sync up
-            Model.EntryAdded += entry =>
-            {
-                InsertEntry(MakeNodeSearchElementVM(entry), entry.Categories);
-                RaisePropertyChanged("BrowserRootCategories");
-            };
-             
+            Model.EntryAdded += AddEntry;
             Model.EntryUpdated += UpdateEntry;
             Model.EntryRemoved += RemoveEntry;
 
@@ -440,6 +436,12 @@ private void InitializeCore()
             InsertClassesIntoTree(LibraryRootCategories);
         }
 
+        private void AddEntry(NodeSearchElement entry)
+        {
+            InsertEntry(MakeNodeSearchElementVM(entry), entry.Categories);
+            RaisePropertyChanged("BrowserRootCategories");
+        }
+
         private IEnumerable<RootNodeCategoryViewModel> CategorizeEntries(IEnumerable<NodeSearchElement> entries, bool expanded)
         {
             var tempRoot = entries.GroupByRecursive<NodeSearchElement, string, NodeCategoryViewModel>(
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -2892,7 +2892,13 @@ public void Dispose()
             dynamoViewModel.SideBarTabItems.CollectionChanged -= this.OnCollectionChanged;
 
             if (fileTrustWarningPopup != null)
+            {
                 fileTrustWarningPopup.CleanPopup();
+            }
+            //TODO code smell.
+            var workspaceView = this.ChildOfType<WorkspaceView>();
+            workspaceView?.Dispose();
+            (workspaceView?.NodeAutoCompleteSearchBar?.Child as IDisposable)?.Dispose();
         }
     }
 }
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
@@ -33,7 +33,7 @@ namespace Dynamo.Views
     /// <summary>
     /// Interaction logic for WorkspaceView.xaml
     /// </summary>
-    public partial class WorkspaceView
+    public partial class WorkspaceView: IDisposable
     {
         public enum CursorState
         {
@@ -1134,5 +1134,10 @@ private void OnGeometryScaling_Click(object sender, RoutedEventArgs e)
             }
             GeoScalingPopup.IsOpen = true;
         }
+
+        public void Dispose()
+        {
+            RemoveViewModelsubscriptions(ViewModel);
+        }
     }
 }
diff --git a/src/DynamoManipulation/DynamoManipulationExtension.cs b/src/DynamoManipulation/DynamoManipulationExtension.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -174,6 +174,13 @@ private void UnregisterEventHandlers()
                 BackgroundPreviewViewModel.CanNavigateBackgroundPropertyChanged -= Watch3DViewModelNavigateBackgroundPropertyChanged;
                 BackgroundPreviewViewModel.ViewMouseDown -= Watch3DViewModelOnViewMouseDown;
             }
+
+            var settings = GetRunSettings(WorkspaceModel);
+            if (settings != null)
+            {
+                settings.PropertyChanged -= OnRunSettingsPropertyChanged;
+            }
+
         }
 
         private void Watch3DViewModelOnViewMouseDown(object o, MouseButtonEventArgs mouseButtonEventArgs)
diff --git a/src/GraphMetadataViewExtension/GraphMetadataViewModel.cs b/src/GraphMetadataViewExtension/GraphMetadataViewModel.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Windows.Media.Imaging;
@@ -266,6 +266,7 @@ private void MarkCurrentWorkspaceModified()
         public void Dispose()
         {
             this.viewLoadedParams.CurrentWorkspaceChanged -= OnCurrentWorkspaceChanged;
+            this.viewLoadedParams.CurrentWorkspaceCleared += OnCurrentWorkspaceChanged;
             if (linterManager != null)
             {
                 linterManager.PropertyChanged -= OnLinterManagerPropertyChange;
diff --git a/src/LibraryViewExtensionWebView2/LibraryViewController.cs b/src/LibraryViewExtensionWebView2/LibraryViewController.cs
@@ -622,7 +622,6 @@ public void Dispose()
         protected void Dispose(bool disposing)
         {
             if (!disposing) return;
-
             if (observer != null) observer.Dispose();
             observer = null;
             if (this.dynamoWindow != null)
@@ -636,11 +635,15 @@ protected void Dispose(bool disposing)
             }
             if (this.browser != null)
             {
+                browser.CoreWebView2.RemoveHostObjectFromScript("bridgeTwoWay");
                 browser.SizeChanged -= Browser_SizeChanged;
                 browser.Loaded -= Browser_Loaded;
                 browser.Dispose();
                 browser = null;
             }
+            twoWayScriptingObject.Dispose();
+            dynamoViewModel = null;
+            commandExecutive = null;
         }
 
         public static async Task<string> ExecuteScriptFunctionAsync(WebView2 webView2, string functionName, params object[] parameters)
diff --git a/src/LibraryViewExtensionWebView2/ScriptingObject.cs b/src/LibraryViewExtensionWebView2/ScriptingObject.cs
@@ -11,7 +11,7 @@ namespace Dynamo.LibraryViewExtensionWebView2
 
     [ClassInterface(ClassInterfaceType.AutoDual)]
     [ComVisible(true)]
-    public class ScriptingObject
+    public class ScriptingObject: IDisposable
     {
         private LibraryViewController controller;
 
@@ -20,6 +20,11 @@ public ScriptingObject(LibraryViewController controller)
             this.controller = controller;
         }
 
+        public void Dispose()
+        {
+            controller = null;
+        }
+
         /// <summary>
         /// Used to get access to the iconResourceProvider and return a base64encoded string version of an icon.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,8 @@ protected virtual void Dispose(bool disposing)`
`436`	`436`	`{`
`437`	`437`	`this.pmExtension.PackageLoader.PackgeLoaded -= OnPackageLoaded;`
`438`	`438`	`}`
	`439`	`+`
	`440`	`+ PackageDocumentationManager.Instance.MessageLogged -= OnMessageLogged;`
`439`	`441`	`PackageDocumentationManager.Instance.Dispose();`
`440`	`442`	`}`
`441`	`443`
Original file line number	Diff line number	Diff line change
`@@ -873,8 +873,8 @@ protected DynamoModel(IStartConfiguration config)`
`873`	`873`	`if (!IsServiceMode)`
`874`	`874`	`{`
`875`	`875`	`SearchModel = new NodeSearchModel(Logger);`
`876`		`- SearchModel.ItemProduced +=`
`877`		`- node => ExecuteCommand(new CreateNodeCommand(node, 0, 0, true, true));`
	`876`	`+ SearchModel.ItemProduced += SearchModel_ItemProduced;`
	`877`	`+`
`878`	`878`	`}`
`879`	`879`
`880`	`880`	`NodeFactory = new NodeFactory();`
`@@ -1021,6 +1021,11 @@ protected DynamoModel(IStartConfiguration config)`
`1021`	`1021`	`DynamoReady(new ReadyParams(this));`
`1022`	`1022`	`}`
`1023`	`1023`
	`1024`	`+ private void SearchModel_ItemProduced(NodeModel node)`
	`1025`	`+ {`
	`1026`	`+ ExecuteCommand(new CreateNodeCommand(node, 0, 0, true, true));`
	`1027`	`+ }`
	`1028`	`+`
`1024`	`1029`	`/// <summary>`
`1025`	`1030`	`/// It returns a PathManager instance based on the mode in order to reuse it's Singleton instance or create a new one`
`1026`	`1031`	`/// </summary>`
`@@ -1476,6 +1481,10 @@ public void Dispose()`
`1476`	`1481`	`FeatureFlags.MessageLogged -= LogMessageWrapper;`
`1477`	`1482`	`}`
`1478`	`1483`	`DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved -= CheckFeatureFlagTest;`
	`1484`	`+ if (!IsServiceMode)`
	`1485`	`+ {`
	`1486`	`+ SearchModel.ItemProduced -= SearchModel_ItemProduced;`
	`1487`	`+ }`
`1479`	`1488`	`}`
`1480`	`1489`
`1481`	`1490`	`private void InitializeCustomNodeManager()`
`@@ -2886,7 +2895,7 @@ public void RemoveWorkspace(WorkspaceModel workspace)`
`2886`	`2895`	`{`
`2887`	`2896`	`OnWorkspaceRemoveStarted(workspace);`
`2888`	`2897`	`if (_workspaces.Remove(workspace))`
`2889`		`- {`
	`2898`	`+ {`
`2890`	`2899`	`if (workspace is HomeWorkspaceModel)`
`2891`	`2900`	`{`
`2892`	`2901`	`workspace.Dispose();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace Dynamo.UI.Controls`
`24`	`24`	`/// Notice this control shares a lot of logic with InCanvasSearchControl for now`
`25`	`25`	`/// But they will diverge eventually because of UI improvements to auto complete.`
`26`	`26`	`/// </summary>`
`27`		`- public partial class NodeAutoCompleteSearchControl`
	`27`	`+ public partial class NodeAutoCompleteSearchControl : IDisposable`
`28`	`28`	`{`
`29`	`29`	`ListBoxItem HighlightedItem;`
`30`	`30`
`@@ -45,7 +45,10 @@ public NodeAutoCompleteSearchControl()`
`45`	`45`	`if (Application.Current != null)`
`46`	`46`	`{`
`47`	`47`	`Application.Current.Deactivated += CurrentApplicationDeactivated;`
`48`		`- Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;`
	`48`	`+ if (Application.Current.MainWindow != null)`
	`49`	`+ {`
	`50`	`+ Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;`
	`51`	`+ }`
`49`	`52`	`}`
`50`	`53`	`HomeWorkspaceModel.WorkspaceClosed += this.CloseAutoCompletion;`
`51`	`54`	`}`
`@@ -55,8 +58,12 @@ private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.Compon`
`55`	`58`	`if (Application.Current != null)`
`56`	`59`	`{`
`57`	`60`	`Application.Current.Deactivated -= CurrentApplicationDeactivated;`
`58`		`- Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;`
	`61`	`+ if (Application.Current.MainWindow != null)`
	`62`	`+ {`
	`63`	`+ Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;`
	`64`	`+ }`
`59`	`65`	`}`
	`66`	`+ HomeWorkspaceModel.WorkspaceClosed -= this.CloseAutoCompletion;`
`60`	`67`	`}`
`61`	`68`
`62`	`69`	`private void CurrentApplicationDeactivated(object sender, EventArgs e)`
`@@ -388,5 +395,10 @@ private void OnSuggestion_Click(object sender, RoutedEventArgs e)`
`388`	`395`	`}`
`389`	`396`	`ViewModel.PopulateAutoCompleteCandidates();`
`390`	`397`	`}`
	`398`	`+`
	`399`	`+ public void Dispose()`
	`400`	`+ {`
	`401`	`+ NodeAutoCompleteSearchControl_Unloaded(this,null);`
	`402`	`+ }`
`391`	`403`	`}`
`392`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using Dynamo.Extensions;`
`3`	`3`	`using Dynamo.Logging;`
`4`	`4`	`using Dynamo.Models;`
`@@ -7,14 +7,19 @@`
`7`	`7`
`8`	`8`	`namespace Dynamo.Wpf.Extensions`
`9`	`9`	`{`
`10`		`- internal class ViewExtensionCommandExecutive : ICommandExecutive`
	`10`	`+ internal class ViewExtensionCommandExecutive : ICommandExecutive,IDisposable`
`11`	`11`	`{`
`12`	`12`	`private readonly DynamoViewModel dynamoViewModel;`
`13`	`13`
`14`	`14`	`public ViewExtensionCommandExecutive(DynamoViewModel model)`
`15`	`15`	`{`
`16`	`16`	`dynamoViewModel = model;`
`17`		`- MessageLogged += (message) => { dynamoViewModel.Model.Logger.Log(message); };`
	`17`	`+ MessageLogged += ViewExtensionCommandExecutive_MessageLogged;`
	`18`	`+ }`
	`19`	`+`
	`20`	`+ private void ViewExtensionCommandExecutive_MessageLogged(ILogMessage message)`
	`21`	`+ {`
	`22`	`+ dynamoViewModel.Model.Logger.Log(message);`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`public void ExecuteCommand(DynamoModel.RecordableCommand command, string uniqueId, string extensionName)`
`@@ -42,5 +47,10 @@ private void Log(ILogMessage obj)`
`42`	`47`	`var handler = MessageLogged;`
`43`	`48`	`if (handler != null) handler(obj);`
`44`	`49`	`}`
	`50`	`+`
	`51`	`+ public void Dispose()`
	`52`	`+ {`
	`53`	`+ MessageLogged -= ViewExtensionCommandExecutive_MessageLogged;`
	`54`	`+ }`
`45`	`55`	`}`
`46`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2892,7 +2892,13 @@ public void Dispose()`
`2892`	`2892`	`dynamoViewModel.SideBarTabItems.CollectionChanged -= this.OnCollectionChanged;`
`2893`	`2893`
`2894`	`2894`	`if (fileTrustWarningPopup != null)`
	`2895`	`+ {`
`2895`	`2896`	`fileTrustWarningPopup.CleanPopup();`
	`2897`	`+ }`
	`2898`	`+ //TODO code smell.`
	`2899`	`+ var workspaceView = this.ChildOfType<WorkspaceView>();`
	`2900`	`+ workspaceView?.Dispose();`
	`2901`	`+ (workspaceView?.NodeAutoCompleteSearchBar?.Child as IDisposable)?.Dispose();`
`2896`	`2902`	`}`
`2897`	`2903`	`}`
`2898`	`2904`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace Dynamo.Views`
`33`	`33`	`/// <summary>`
`34`	`34`	`/// Interaction logic for WorkspaceView.xaml`
`35`	`35`	`/// </summary>`
`36`		`- public partial class WorkspaceView`
	`36`	`+ public partial class WorkspaceView: IDisposable`
`37`	`37`	`{`
`38`	`38`	`public enum CursorState`
`39`	`39`	`{`
`@@ -1134,5 +1134,10 @@ private void OnGeometryScaling_Click(object sender, RoutedEventArgs e)`
`1134`	`1134`	`}`
`1135`	`1135`	`GeoScalingPopup.IsOpen = true;`
`1136`	`1136`	`}`
	`1137`	`+`
	`1138`	`+ public void Dispose()`
	`1139`	`+ {`
	`1140`	`+ RemoveViewModelsubscriptions(ViewModel);`
	`1141`	`+ }`
`1137`	`1142`	`}`
`1138`	`1143`	`}`