From eb88897a2abd31927ff0491feabf5a1f40061e45 Mon Sep 17 00:00:00 2001
From: Matt Parker <61717342+MattParkerDev@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:43:49 +1000
Subject: [PATCH] Move Godot events to instance

---
 .../BottomPanel/BottomPanelManager.cs         |  8 +++---
 .../Features/CodeEditor/CodeEditorPanel.cs    |  4 +--
 .../Features/LeftSideBar/LeftSideBar.cs       | 12 ++++-----
 .../Features/Problems/ProblemsPanel.cs        |  2 +-
 .../Features/Run/RunMenuItem.cs               |  4 +--
 .../Features/Search/SearchResultComponent.cs  |  2 +-
 .../SolutionExplorer/SolutionExplorerPanel.cs |  6 ++---
 src/SharpIDE.Godot/GodotGlobalEvents.cs       | 27 ++++++++++---------
 src/SharpIDE.Godot/IdeRoot.cs                 | 14 +++++++---
 9 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
index 12c07d0..09a8eb5 100644
--- a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
+++ b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
@@ -42,12 +42,12 @@ public partial class BottomPanelManager : Panel
             { BottomPanelType.IdeDiagnostics, _ideDiagnosticsPanel }
         };
 
-        GodotGlobalEvents.BottomPanelTabSelected += OnBottomPanelTabSelected;
+        GodotGlobalEvents.Instance.BottomPanelTabSelected += OnBottomPanelTabSelected;
     }
 
     public override void _ExitTree()
     {
-        GodotGlobalEvents.BottomPanelTabSelected -= OnBottomPanelTabSelected;
+        GodotGlobalEvents.Instance.BottomPanelTabSelected -= OnBottomPanelTabSelected;
     }
 
     private async Task OnBottomPanelTabSelected(BottomPanelType? type)
@@ -56,11 +56,11 @@ public partial class BottomPanelManager : Panel
         {
             if (type == null)
             {
-                GodotGlobalEvents.InvokeBottomPanelVisibilityChangeRequested(false);
+                GodotGlobalEvents.Instance.InvokeBottomPanelVisibilityChangeRequested(false);
             }
             else
             {
-                GodotGlobalEvents.InvokeBottomPanelVisibilityChangeRequested(true);
+                GodotGlobalEvents.Instance.InvokeBottomPanelVisibilityChangeRequested(true);
             }
             foreach (var kvp in _panelTypeMap)
             {
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
index 9b60c67..08a40b1 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
@@ -39,7 +39,7 @@ public partial class CodeEditorPanel : MarginContainer
     private void OnTabClicked(long tab)
     {
         var sharpIdeFile = _tabContainer.GetChild<SharpIdeCodeEdit>((int)tab).SharpIdeFile;
-        GodotGlobalEvents.InvokeFileExternallySelected(sharpIdeFile);
+        GodotGlobalEvents.Instance.InvokeFileExternallySelected(sharpIdeFile);
     }
 
     private void OnTabClosePressed(long tabIndex)
@@ -87,7 +87,7 @@ public partial class CodeEditorPanel : MarginContainer
         if (executionStopInfo.FilePath != currentSharpIdeFile?.Path)
         {
             var file = Solution.AllFiles.Single(s => s.Path == executionStopInfo.FilePath);
-            await GodotGlobalEvents.InvokeFileExternallySelectedAndWait(file).ConfigureAwait(false);
+            await GodotGlobalEvents.Instance.InvokeFileExternallySelectedAndWait(file).ConfigureAwait(false);
         }
         var lineInt = executionStopInfo.Line - 1; // Debugging is 1-indexed, Godot is 0-indexed
         Guard.Against.Negative(lineInt, nameof(lineInt));
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
index 1f95ceb..4034527 100644
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
+++ b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
@@ -21,12 +21,12 @@ public partial class LeftSideBar : Panel
         _debugButton = GetNode<Button>("%DebugButton");
         _ideDiagnosticsButton = GetNode<Button>("%IdeDiagnosticsButton");
         
-        _problemsButton.Toggled += toggledOn => GodotGlobalEvents.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Problems : null);
-        _runButton.Toggled += toggledOn => GodotGlobalEvents.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Run : null);
-        _buildButton.Toggled += toggledOn => GodotGlobalEvents.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Build : null);
-        _debugButton.Toggled += toggledOn => GodotGlobalEvents.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Debug : null);
-        _ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.IdeDiagnostics : null);
-        GodotGlobalEvents.BottomPanelTabExternallySelected += OnBottomPanelTabExternallySelected;
+        _problemsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Problems : null);
+        _runButton.Toggled += toggledOn => GodotGlobalEvents.Instance.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Run : null);
+        _buildButton.Toggled += toggledOn => GodotGlobalEvents.Instance.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Build : null);
+        _debugButton.Toggled += toggledOn => GodotGlobalEvents.Instance.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.Debug : null);
+        _ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.InvokeBottomPanelTabSelected(toggledOn ? BottomPanelType.IdeDiagnostics : null);
+        GodotGlobalEvents.Instance.BottomPanelTabExternallySelected += OnBottomPanelTabExternallySelected;
     }
 
     private async Task OnBottomPanelTabExternallySelected(BottomPanelType arg)
diff --git a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
index 06e17cd..ced383b 100644
--- a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
+++ b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
@@ -124,6 +124,6 @@ public partial class ProblemsPanel : Control
         var file = projectModel.Files
             .Concat(projectModel.Folders.SelectMany(f => f.GetAllFiles()))
             .Single(s => s.Path == diagnostic.Location.SourceTree?.GetMappedLineSpan(diagnostic.Location.SourceSpan).Path);
-        GodotGlobalEvents.InvokeFileExternallySelected(file);
+        GodotGlobalEvents.Instance.InvokeFileExternallySelected(file);
     }
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
index 552d6a7..a60051a 100644
--- a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
+++ b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
@@ -51,13 +51,13 @@ public partial class RunMenuItem : HBoxContainer
 
     private async void OnRunButtonPressed()
     {
-		GodotGlobalEvents.InvokeBottomPanelTabExternallySelected(BottomPanelType.Run);
+		GodotGlobalEvents.Instance.InvokeBottomPanelTabExternallySelected(BottomPanelType.Run);
         await Singletons.RunService.RunProject(Project).ConfigureAwait(false);
     }
     
     private async void OnDebugButtonPressed()
     {
-        GodotGlobalEvents.InvokeBottomPanelTabExternallySelected(BottomPanelType.Debug);
+        GodotGlobalEvents.Instance.InvokeBottomPanelTabExternallySelected(BottomPanelType.Debug);
         await Singletons.RunService.RunProject(Project, true).ConfigureAwait(false);
     }
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Search/SearchResultComponent.cs b/src/SharpIDE.Godot/Features/Search/SearchResultComponent.cs
index e9c766a..94a3f4e 100644
--- a/src/SharpIDE.Godot/Features/Search/SearchResultComponent.cs
+++ b/src/SharpIDE.Godot/Features/Search/SearchResultComponent.cs
@@ -27,7 +27,7 @@ public partial class SearchResultComponent : MarginContainer
     private void OnButtonPressed()
     {
         var fileLinePosition = new SharpIdeFileLinePosition { Line = Result.Line, Column = Result.StartColumn };
-        GodotGlobalEvents.InvokeFileExternallySelected(Result.File, fileLinePosition);
+        GodotGlobalEvents.Instance.InvokeFileExternallySelected(Result.File, fileLinePosition);
         ParentSearchWindow.Hide();
     }
 
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
index 83574bc..2c2127a 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
@@ -25,7 +25,7 @@ public partial class SolutionExplorerPanel : MarginContainer
 	{
 		_tree = GetNode<Tree>("Tree");
 		_tree.ItemMouseSelected += TreeOnItemMouseSelected;
-		GodotGlobalEvents.FileExternallySelected += OnFileExternallySelected;
+		GodotGlobalEvents.Instance.FileExternallySelected += OnFileExternallySelected;
 	}
 
 	private void TreeOnItemMouseSelected(Vector2 mousePosition, long mouseButtonIndex)
@@ -36,13 +36,13 @@ public partial class SolutionExplorerPanel : MarginContainer
 		if (sharpIdeFileContainer is null) return;
 		var sharpIdeFile = sharpIdeFileContainer.File;
 		Guard.Against.Null(sharpIdeFile, nameof(sharpIdeFile));
-		GodotGlobalEvents.InvokeFileSelected(sharpIdeFile);
+		GodotGlobalEvents.Instance.InvokeFileSelected(sharpIdeFile);
 	}
 	
 	private async Task OnFileExternallySelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
 	{
 		await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
-		var task = GodotGlobalEvents.InvokeFileSelectedAndWait(file, fileLinePosition);
+		var task = GodotGlobalEvents.Instance.InvokeFileSelectedAndWait(file, fileLinePosition);
 		var item = FindItemRecursive(_tree.GetRoot(), file);
 		if (item is not null)
 		{
diff --git a/src/SharpIDE.Godot/GodotGlobalEvents.cs b/src/SharpIDE.Godot/GodotGlobalEvents.cs
index f4eae12..2b9d2ab 100644
--- a/src/SharpIDE.Godot/GodotGlobalEvents.cs
+++ b/src/SharpIDE.Godot/GodotGlobalEvents.cs
@@ -4,23 +4,24 @@ using SharpIDE.Application.Features.SolutionDiscovery;
 
 namespace SharpIDE.Godot;
 
-public static class GodotGlobalEvents
+public class GodotGlobalEvents
 {
-    public static event Func<BottomPanelType, Task> BottomPanelTabExternallySelected = _ => Task.CompletedTask;
-    public static void InvokeBottomPanelTabExternallySelected(BottomPanelType type) => BottomPanelTabExternallySelected.InvokeParallelFireAndForget(type);
+    public static GodotGlobalEvents Instance { get; set; } = null!;
+    public event Func<BottomPanelType, Task> BottomPanelTabExternallySelected = _ => Task.CompletedTask;
+    public void InvokeBottomPanelTabExternallySelected(BottomPanelType type) => BottomPanelTabExternallySelected.InvokeParallelFireAndForget(type);
     
-    public static event Func<BottomPanelType?, Task> BottomPanelTabSelected = _ => Task.CompletedTask;
-    public static void InvokeBottomPanelTabSelected(BottomPanelType? type) => BottomPanelTabSelected.InvokeParallelFireAndForget(type);
+    public event Func<BottomPanelType?, Task> BottomPanelTabSelected = _ => Task.CompletedTask;
+    public void InvokeBottomPanelTabSelected(BottomPanelType? type) => BottomPanelTabSelected.InvokeParallelFireAndForget(type);
     
-    public static event Func<bool, Task> BottomPanelVisibilityChangeRequested = _ => Task.CompletedTask;
-    public static void InvokeBottomPanelVisibilityChangeRequested(bool show) => BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(show);
+    public event Func<bool, Task> BottomPanelVisibilityChangeRequested = _ => Task.CompletedTask;
+    public void InvokeBottomPanelVisibilityChangeRequested(bool show) => BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(show);
     
-    public static event Func<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileSelected = (_, _) => Task.CompletedTask;
-    public static void InvokeFileSelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition = null) => FileSelected.InvokeParallelFireAndForget(file, fileLinePosition);
-    public static async Task InvokeFileSelectedAndWait(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition) => await FileSelected.InvokeParallelAsync(file, fileLinePosition);
-    public static event Func<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileExternallySelected = (_, _) => Task.CompletedTask;
-    public static void InvokeFileExternallySelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition = null) => FileExternallySelected.InvokeParallelFireAndForget(file, fileLinePosition);
-    public static async Task InvokeFileExternallySelectedAndWait(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition = null) => await FileExternallySelected.InvokeParallelAsync(file, fileLinePosition);
+    public event Func<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileSelected = (_, _) => Task.CompletedTask;
+    public void InvokeFileSelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition = null) => FileSelected.InvokeParallelFireAndForget(file, fileLinePosition);
+    public async Task InvokeFileSelectedAndWait(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition) => await FileSelected.InvokeParallelAsync(file, fileLinePosition);
+    public event Func<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileExternallySelected = (_, _) => Task.CompletedTask;
+    public void InvokeFileExternallySelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition = null) => FileExternallySelected.InvokeParallelFireAndForget(file, fileLinePosition);
+    public async Task InvokeFileExternallySelectedAndWait(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition = null) => await FileExternallySelected.InvokeParallelAsync(file, fileLinePosition);
     
 }
 
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index f024fac..8756bdd 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -30,6 +30,12 @@ public partial class IdeRoot : Control
 	
 	private readonly PackedScene _runMenuItemScene = ResourceLoader.Load<PackedScene>("res://Features/Run/RunMenuItem.tscn");
 	private TaskCompletionSource _nodeReadyTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	public override void _EnterTree()
+	{
+		GodotGlobalEvents.Instance = new GodotGlobalEvents();
+	}
+
 	public override void _Ready()
 	{
 		_openSlnButton = GetNode<Button>("%OpenSlnButton");
@@ -45,11 +51,11 @@ public partial class IdeRoot : Control
 		_bottomPanelManager = GetNode<BottomPanelManager>("%BottomPanel");
 		
 		_runMenuButton.Pressed += OnRunMenuButtonPressed;
-		GodotGlobalEvents.FileSelected += OnSolutionExplorerPanelOnFileSelected;
+		GodotGlobalEvents.Instance.FileSelected += OnSolutionExplorerPanelOnFileSelected;
 		_fileDialog.FileSelected += SetSlnFilePath;
 		_openSlnButton.Pressed += () => IdeWindow.PickSolution();
 		_buildSlnButton.Pressed += OnBuildSlnButtonPressed;
-		GodotGlobalEvents.BottomPanelVisibilityChangeRequested += async show => await this.InvokeAsync(() => _invertedVSplitContainer.InvertedSetCollapsed(!show));
+		GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested += async show => await this.InvokeAsync(() => _invertedVSplitContainer.InvertedSetCollapsed(!show));
 		_nodeReadyTcs.SetResult();
 		//OnSlnFileSelected(@"C:\Users\Matthew\Documents\Git\BlazorCodeBreaker\BlazorCodeBreaker.slnx");
 	}
@@ -64,7 +70,7 @@ public partial class IdeRoot : Control
 
 	private async void OnBuildSlnButtonPressed()
 	{
-		GodotGlobalEvents.InvokeBottomPanelTabExternallySelected(BottomPanelType.Build);
+		GodotGlobalEvents.Instance.InvokeBottomPanelTabExternallySelected(BottomPanelType.Build);
 		await Singletons.BuildService.MsBuildSolutionAsync(_solutionExplorerPanel.SolutionModel.FilePath);
 	}
 
@@ -89,7 +95,7 @@ public partial class IdeRoot : Control
 			
 			var infraProject = solutionModel.AllProjects.SingleOrDefault(s => s.Name == "WebUi");
 			var diFile = infraProject?.Folders.Single(s => s.Name == "Pages").Files.Single(s => s.Name == "TestPage.razor");
-			if (diFile != null) await this.InvokeDeferredAsync(() => GodotGlobalEvents.InvokeFileExternallySelected(diFile));
+			if (diFile != null) await this.InvokeDeferredAsync(() => GodotGlobalEvents.Instance.InvokeFileExternallySelected(diFile));
 				
 			var tasks = solutionModel.AllProjects.Select(p => p.MsBuildEvaluationProjectTask).ToList();
 			await Task.WhenAll(tasks).ConfigureAwait(false);