- Fixed some crashes in previous commits

! Addessed memory leak (#173)
wmjordan · Oct 27, 2021 · fdadc0c · fdadc0c
1 parent 6f35b99
commit fdadc0c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 13 deletions.
diff --git a/Codist/Controls/ExternalAdornment.cs b/Codist/Controls/ExternalAdornment.cs
@@ -54,7 +54,12 @@ public void FocusOnTextView() {
 		public void ClearUnpinnedChildren() {
 			for (int i = Children.Count - 1; i >= 0; i--) {
 				if (Children[i] is SymbolList l && l.IsPinned == false) {
-					Children.RemoveAndDisposeAt(i);
+					if (l.Owner == null) {
+						Children.RemoveAndDisposeAt(i);
+					}
+					else {
+						Children.RemoveAt(i);
+					}
 				}
 			}
 		}

diff --git a/Codist/Controls/VirtualList.cs b/Codist/Controls/VirtualList.cs
@@ -40,6 +40,7 @@ public double ItemsControlMaxHeight {
 		}
 		public ListCollectionView FilteredItems { get; set; }
 		public FrameworkElement Container { get; set; }
+		public FrameworkElement Owner { get; set; }
 		public bool NeedsRefresh { get; set; }
 		public bool EnableVirtualMode {
 			get => ScrollViewer.GetCanContentScroll(this);
@@ -125,6 +126,7 @@ protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo) {
 		public virtual void Dispose() {
 			Container = null;
 			FilteredItems = null;
+			Owner = null;
 			DataContext = null;
 		}
 	}

diff --git a/Codist/Helpers/WpfHelper.cs b/Codist/Helpers/WpfHelper.cs
@@ -488,7 +488,7 @@ public static bool FocusLast<TItem>(this ItemCollection items)
 			return false;
 		}
 		/// <summary>
-		/// Calls <see cref="IDisposable.Dispose"/> on each item in <paramref name="control"/> and empties the collection.
+		/// Calls <see cref="IDisposable.Dispose"/> on each item in <paramref name="control"/> and empties the <see cref="ItemsControl"/>.
 		/// </summary>
 		public static void DisposeCollection(this ItemsControl control) {
 			foreach (var item in control.Items) {

diff --git a/Codist/NaviBar/CSharpBar.cs b/Codist/NaviBar/CSharpBar.cs
@@ -481,12 +481,6 @@ void View_Closed(object sender, EventArgs e) {
 			_ActiveItem = null;
 			_GlobalNamespaceItem = null;
 			_RootItem = null;
-			foreach (var item in Items) {
-				if (item is IDisposable d) {
-					d.Dispose();
-				}
-			}
-			Items.Clear();
 		}
 
 		void DisposeSymbolList(SymbolList l) {
@@ -531,7 +525,8 @@ sealed class RootItem : BarItem, IContextMenuHost
 						}
 					},
 					Footer = _Note = new TextBlock { Margin = WpfHelper.MenuItemMargin }
-						.ReferenceProperty(TextBlock.ForegroundProperty, EnvironmentColors.SystemGrayTextBrushKey)
+						.ReferenceProperty(TextBlock.ForegroundProperty, EnvironmentColors.SystemGrayTextBrushKey),
+					Owner = this
 				};
 				Codist.Controls.DragDropHelper.SetScrollOnDragDrop(_Menu, true);
 				Bar.SetupSymbolListMenu(_Menu);
@@ -942,7 +937,8 @@ async Task CreateMenuForNamespaceNodeAsync(CancellationToken cancellationToken)
 					Container = Bar.ListContainer,
 					ContainerType = SymbolListType.TypeList,
 					ExtIconProvider = ExtIconProvider.Default.GetExtIcons,
-					EnableVirtualMode = true
+					EnableVirtualMode = true,
+					Owner = this
 				};
 				Codist.Controls.DragDropHelper.SetScrollOnDragDrop(_Menu, true);
 				if (_FilterBox != null) {
@@ -1128,6 +1124,7 @@ async Task CreateMenuForTypeSymbolNodeAsync(CancellationToken cancellationToken)
 					Container = Bar.ListContainer,
 					ContainerType = SymbolListType.NodeList,
 					ExtIconProvider = s => GetExtIcons(s.SyntaxNode),
+					Owner = this
 				};
 				Codist.Controls.DragDropHelper.SetScrollOnDragDrop(_Menu, true);
 				_Menu.Header = new WrapPanel {

diff --git a/Codist/NaviBar/MarkdownBar.cs b/Codist/NaviBar/MarkdownBar.cs
@@ -78,6 +78,7 @@ void HideMenu() {
 			if (_TitleList != null) {
 				ListContainer.Children.Remove(_TitleList);
 				_TitleList.SelectedItem = null;
+				_TitleList.Dispose();
 				_TitleList = null;
 				_ActiveItem.IsHighlighted = false;
 			}
@@ -133,6 +134,7 @@ public override void ShowRootItemMenu(int parameter) {
 			if (_TitleList != menu) {
 				ListContainer.Children.Remove(_TitleList);
 				ListContainer.Children.Add(menu);
+				_TitleList.Dispose();
 				_TitleList = menu;
 			}
 			if (menu != null) {
@@ -183,8 +185,10 @@ void View_Closed(object sender, EventArgs e) {
 			view.Closed -= View_Closed;
 			view.Properties.RemoveProperty(typeof(TaggerResult));
 			_TextSearch = null;
-			_TitleList.Dispose();
-			_TitleList = null;
+			if (_TitleList != null) {
+				_TitleList.Dispose();
+				_TitleList = null;
+			}
 		}
 
 		//void AddItem(int imageId, RoutedEventHandler clickHandler) {

diff --git a/Codist/NaviBar/NaviBar.cs b/Codist/NaviBar/NaviBar.cs
@@ -68,6 +68,8 @@ void View_Closed(object sender, EventArgs e) {
 					c.Content = null;
 				}
 				ListContainer = null;
+				DataContext = null;
+				this.DisposeCollection();
 				_View.Properties.RemoveProperty(nameof(NaviBar));
 				_View.Properties.RemoveProperty(typeof(ExternalAdornment));
 				_View = null;

diff --git a/Codist/SmartBars/SmartBar.cs b/Codist/SmartBars/SmartBar.cs
@@ -486,6 +486,7 @@ public void Dispose() {
 						ContextMenu.PlacementTarget = null;
 						ContextMenu = null;
 					}
+					DataContext = null;
 					_Bar = null;
 				}
 			}

diff --git a/Codist/Taggers/CSharpTagger.cs b/Codist/Taggers/CSharpTagger.cs
@@ -190,7 +190,10 @@ public void Dispose() {
 
 		void ReleaseResources() {
 			if (_Buffer != null) {
-				_TaskBreaker?.Dispose();
+				if (_TaskBreaker != null) {
+					_TaskBreaker.Dispose();
+					_TaskBreaker = null;
+				}
 				var last = _LastFinishedTask;
 				if (last != null) {
 					_LastFinishedTask = null;