Sln Explorer - replace RefCountedContainer with ConditionalWeakTable

Author: MattParkerDev

src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.Clipboard.cs

@@ -16,11 +16,11 @@ private void AddSelectedNodesToSlnExplorerClipboard(ClipboardOperation clipboard
         _itemsOnClipboard = (selectedItems
             .Select(item =>
             {
-                var metadata = item.GetMetadata(0).As<RefCounted?>();
-                IFileOrFolder? result = metadata switch
+                var sharpIdeNode = item.SharpIdeNode;
+                IFileOrFolder? result = sharpIdeNode switch
                 {
-                    RefCountedContainer<SharpIdeFile> file => file.Item,
-                    RefCountedContainer<SharpIdeFolder> folder => folder.Item,
+                    SharpIdeFile file => file,
+                    SharpIdeFolder folder => folder,
                     _ => null
                 };
                 return result;
@@ -65,11 +65,11 @@ private void CopyNodesFromClipboardToSelectedNode()
     {
         var selected = _tree.GetSelected();
         if (selected is null || _itemsOnClipboard is null) return;
-        var genericMetadata = selected.GetMetadata(0).As<RefCounted?>();
-        IFolderOrProject? destinationFolderOrProject = genericMetadata switch
+        var sharpIdeNode = selected.SharpIdeNode;
+        IFolderOrProject? destinationFolderOrProject = sharpIdeNode switch
         {
-            RefCountedContainer<SharpIdeFolder> f => f.Item,
-            RefCountedContainer<SharpIdeProjectModel> p => p.Item,
+            SharpIdeFolder f => f,
+            SharpIdeProjectModel p => p,
             _ => null
         };
         if (destinationFolderOrProject is null) return;

src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs

@@ -85,16 +85,16 @@ private void TreeOnItemMouseSelected(Vector2 mousePosition, long mouseButtonInde
 
 		var mouseButtonMask = (MouseButtonMask)mouseButtonIndex;
 
-		var genericMetadata = selected.GetMetadata(0).As<RefCounted?>();
-		switch (mouseButtonMask, genericMetadata)
+		var sharpIdeNode = selected.SharpIdeNode;
+		switch (mouseButtonMask, sharpIdeNode)
 		{
-			case (MouseButtonMask.Left, RefCountedContainer<SharpIdeFile> fileContainer): GodotGlobalEvents.Instance.FileSelected.InvokeParallelFireAndForget(fileContainer.Item, null); break;
-			case (MouseButtonMask.Right, RefCountedContainer<SharpIdeFile> fileContainer): OpenContextMenuFile(fileContainer.Item); break;
-			case (MouseButtonMask.Left, RefCountedContainer<SharpIdeProjectModel> { Item.IsInvalid: true }): GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Problems); break;
-			case (MouseButtonMask.Right, RefCountedContainer<SharpIdeProjectModel> projectContainer): OpenContextMenuProject(projectContainer.Item); break;
-			case (MouseButtonMask.Left, RefCountedContainer<SharpIdeFolder>): break;
-			case (MouseButtonMask.Right, RefCountedContainer<SharpIdeFolder> folderContainer): OpenContextMenuFolder(folderContainer.Item, selected); break;
-			case (MouseButtonMask.Left, RefCountedContainer<SharpIdeSolutionFolder>): break;
+			case (MouseButtonMask.Left, SharpIdeFile file): GodotGlobalEvents.Instance.FileSelected.InvokeParallelFireAndForget(file, null); break;
+			case (MouseButtonMask.Right, SharpIdeFile file): OpenContextMenuFile(file); break;
+			case (MouseButtonMask.Left, SharpIdeProjectModel { IsInvalid: true }): GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Problems); break;
+			case (MouseButtonMask.Right, SharpIdeProjectModel project): OpenContextMenuProject(project); break;
+			case (MouseButtonMask.Left, SharpIdeFolder): break;
+			case (MouseButtonMask.Right, SharpIdeFolder folder): OpenContextMenuFolder(folder, selected); break;
+			case (MouseButtonMask.Left, SharpIdeSolutionFolder): break;
 			default: break;
 		}
 	}
@@ -112,8 +112,8 @@ private async Task OnFileExternallySelected(SharpIdeFile file, SharpIdeFileLineP
 		var selectedItem = _tree.GetSelected();
 		if (selectedItem is not null)
 		{
-			var selectedFile = selectedItem.GetTypedMetadata<RefCountedContainer<SharpIdeFile>?>(0)?.Item;
-			if (selectedFile == file)
+			var selectedSharpIdeNode = selectedItem.SharpIdeNode;
+			if (selectedSharpIdeNode == file)
 				return;
 		}
 		var item = FindItemRecursive(_tree.GetRoot(), file);
@@ -132,7 +132,7 @@ await this.InvokeAsync(() =>
 
 	private static TreeItem? FindItemRecursive(TreeItem item, SharpIdeFile file)
 	{
-		if (item.GetTypedMetadata<RefCountedContainer<SharpIdeFile>?>(0)?.Item == file)
+		if (item.SharpIdeNode == file)
 			return item;
 
 		var child = item.GetFirstChild();
@@ -201,7 +201,7 @@ private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSol
 	    var folderItem = tree.CreateItem(parent);
         folderItem.SetText(0, slnFolder.Name);
         folderItem.SetIcon(0, SlnFolderIcon);
-        folderItem.SetMetadata(0, new RefCountedContainer<SharpIdeSolutionFolder>(slnFolder));
+        folderItem.SharpIdeNode = slnFolder;
 
         // Observe folder sub-collections
         var subFoldersView = slnFolder.Folders.CreateView(y => new TreeItemContainer());
@@ -245,7 +245,7 @@ private TreeItem CreateProjectTreeItem(Tree tree, TreeItem parent, SharpIdeProje
 		var icon = projectModel.IsLoading ? LoadingProjectIcon : projectModel.IsInvalid ? UnloadedProjectIcon : CsprojIcon;
 		projectItem.SetIcon(0, icon);
 		if (projectModel.IsLoading is false && projectModel.IsInvalid) projectItem.SetSuffix(0, " ·  load failed");
-		projectItem.SetMetadata(0, new RefCountedContainer<SharpIdeProjectModel>(projectModel));
+		projectItem.SharpIdeNode = projectModel;
 
 		projectModel.MsBuildProjectLoadState.SubscribeOnThreadPool().ObserveOnThreadPool().SubscribeAwait(async (loadState, ct) =>
 		{
@@ -298,7 +298,7 @@ private TreeItem CreateFolderTreeItem(Tree tree, TreeItem parent, SharpIdeFolder
 		var folderItem = tree.CreateItem(parent, newStartingIndex);
 		folderItem.SetText(0, sharpIdeFolder.Name.Value);
 		folderItem.SetIcon(0, FolderIcon);
-		folderItem.SetMetadata(0, new RefCountedContainer<SharpIdeFolder>(sharpIdeFolder));
+		folderItem.SharpIdeNode = sharpIdeFolder;
 
 		Observable.EveryValueChanged(sharpIdeFolder, folder => folder.Name.Value)
 			.Skip(1).SubscribeOnThreadPool().ObserveOnThreadPool().SubscribeAwait(async (s, ct) =>
@@ -350,7 +350,7 @@ private TreeItem CreateFileTreeItem(Tree tree, TreeItem parent, SharpIdeFile sha
 		fileItem.SetIconsForFileExtension(sharpIdeFile);
 		if (GitColours.GetColorForGitFileStatus(sharpIdeFile.GitStatus) is { } notnullColor) fileItem.SetCustomColor(0, notnullColor);
 		else fileItem.ClearCustomColor(0);
-		fileItem.SetMetadata(0, new RefCountedContainer<SharpIdeFile>(sharpIdeFile));
+		fileItem.SharpIdeNode = sharpIdeFile;
 
 		Observable.EveryValueChanged(sharpIdeFile, file => file.Name.Value)
 			.Skip(1).SubscribeOnThreadPool().ObserveOnThreadPool().SubscribeAwait(async (s, ct) =>

src/SharpIDE.Godot/NodeExtensions.cs

@@ -1,8 +1,6 @@
-using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
 using Godot;
-using ObservableCollections;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-using SharpIDE.Godot.Features.Problems;
 
 namespace SharpIDE.Godot;
 
@@ -124,17 +122,23 @@ public Vector2 GetStringsSize(
         }
     }
 
+    private static readonly ConditionalWeakTable<TreeItem, ISharpIdeNode> TreeItemSharpIdeNode = [];
     extension(TreeItem treeItem)
     {
-        public T? GetTypedMetadata<T>(int column) where T : RefCounted?
+        public ISharpIdeNode? SharpIdeNode
         {
-            var metadata = treeItem.GetMetadata(column);
-            var refCountedMetadata = metadata.As<RefCounted?>();
-            if (refCountedMetadata is T correctTypeContainer)
+            get => TreeItemSharpIdeNode.TryGetValue(treeItem, out var s) ? s : null;
+            set
             {
-                return correctTypeContainer;
+                if (value is null)
+                {
+                    TreeItemSharpIdeNode.Remove(treeItem);
+                }
+                else
+                {
+                    TreeItemSharpIdeNode.AddOrUpdate(treeItem, value);
+                }
             }
-            return null;
         }
         public void MoveToIndexInParent(int currentIndex, int newIndex)
         {