fix more memory leaks when starting and closing DynamoRevit

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()

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();
         }
 

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();

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);
+        }
     }
 }

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;
+        }
     }
 }

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 

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);

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>(

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();
         }
     }
 }

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);
+        }
     }
 }

src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs

@@ -73,6 +73,10 @@ public DynamoView DynamoView
             set
             {
                 dynamoView = value;
+                if(dynamoView == null)
+                {
+                    return;
+                }
                 viewModel = value.DataContext as DynamoViewModel;
                 // When view model is closed, we need to close the splash screen if it is displayed.
                 viewModel.RequestClose += SplashScreenRequestClose;
@@ -484,8 +488,14 @@ internal void CloseWindow()
             // RequestUpdateLoadBarStatus event needs to be unsubscribed when the splash screen window is closed, to avoid populating the info on splash screen.
             else
             {
-                this.Close();
-                viewModel?.Model.ShutDown(false);
+                Close();
+                if (viewModel != null)
+                {
+                    viewModel.RequestClose -= SplashScreenRequestClose;
+                }
+
+                DynamoView?.Close();
+                DynamoView = null;
             }
         }
 

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)

src/GraphMetadataViewExtension/GraphMetadataViewExtension.cs

@@ -110,10 +110,12 @@ public override void Closed()
 
         protected virtual void Dispose(bool disposing)
         {
-            viewModel.Dispose();
-
-            this.graphMetadataMenuItem.Checked -= MenuItemCheckHandler;
-            this.graphMetadataMenuItem.Unchecked -= MenuItemUnCheckedHandler;
+            viewModel?.Dispose();
+            if (graphMetadataMenuItem != null)
+            {
+                graphMetadataMenuItem.Checked -= MenuItemCheckHandler;
+                graphMetadataMenuItem.Unchecked -= MenuItemUnCheckedHandler;
+            }
         }
 
         public override void Dispose()

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;

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)