refactor LoadSolution

Author: MattParkerDev

src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceSolutionService.cs

@@ -12,25 +12,33 @@ public class VsPersistenceSolutionService
 	private ISolutionSerializer? _solutionSerializer;
 	private string? _solutionFilePath;
 
-	public async Task<SharpIdeSolutionModel> LoadSolution(string solutionFilePath, CancellationToken cancellationToken = default)
+	public async Task LoadSolution(string solutionFilePath, SolutionModel vsSln, ISolutionSerializer slnSerializer, CancellationToken cancellationToken = default)
 	{
-		using var _ = SharpIdeOtel.Source.StartActivity();
+		_vsSolution = vsSln;
+		_solutionSerializer = slnSerializer;
 		_solutionFilePath = solutionFilePath;
+	}
+	// Weird separation between ReadSolution and LoadSolution is so we can call the static ReadSolution in IdeRoot before all the UI Nodes are ready and DI services injected
+	public static async Task<(SharpIdeSolutionModel, SolutionModel, ISolutionSerializer)> ReadSolution(string solutionFilePath, CancellationToken cancellationToken = default)
+	{
+		using var _ = SharpIdeOtel.Source.StartActivity();
 
+		ISolutionSerializer? solutionSerializer;
+		SolutionModel vsSolution;
 		using (SharpIdeOtel.Source.StartActivity("VsPersistence.OpenSolution"))
 		{
-			_solutionSerializer = SolutionSerializers.GetSerializerByMoniker(solutionFilePath);
-			Guard.Against.Null(_solutionSerializer);
-			_vsSolution = await _solutionSerializer.OpenAsync(solutionFilePath, cancellationToken);
+			solutionSerializer = SolutionSerializers.GetSerializerByMoniker(solutionFilePath);
+			Guard.Against.Null(solutionSerializer);
+			vsSolution = await solutionSerializer.OpenAsync(solutionFilePath, cancellationToken);
 		}
 
 		// This intermediate model is pretty much useless, but I have left it around as we grab the project nodes with it, which we might use later.
-		var intermediateModel = await IntermediateMapper.GetIntermediateModel(solutionFilePath, _vsSolution, cancellationToken);
+		var intermediateModel = await IntermediateMapper.GetIntermediateModel(solutionFilePath, vsSolution, cancellationToken);
 
 		var solutionModel = new SharpIdeSolutionModel(solutionFilePath, intermediateModel);
 
 		var gitFolderPath = Repository.Discover(solutionFilePath);
-		if (gitFolderPath is null) return solutionModel;
+		if (gitFolderPath is null) return (solutionModel, vsSolution, solutionSerializer);
 		using var repo = new Repository(gitFolderPath);
 		var status = repo.RetrieveStatus(new StatusOptions());
 
@@ -52,7 +60,7 @@ public async Task<SharpIdeSolutionModel> LoadSolution(string solutionFilePath, C
 			fileInSolution.GitStatus = mappedGitStatus;
 		}
 
-		return solutionModel;
+		return (solutionModel, vsSolution, solutionSerializer);
 	}
 
 	public async Task AddProject(IExpandableSharpIdeNode parentNode, string projectName, string projectFilePath, CancellationToken cancellationToken = default)

src/SharpIDE.Godot/IdeRoot.cs

@@ -152,12 +152,13 @@ public void SetSlnFilePath(string path)
 		_ = Task.GodotRun(async () =>
 		{
 			GD.Print($"Selected: {path}");
-			await _nodeReadyTcs.Task;
-			// Do not use injected services until after _nodeReadyTcs - Services aren't injected until _Ready
 			var timer = Stopwatch.StartNew();
-			var solutionModel = await _vsPersistenceSolutionService.LoadSolution(path);
+			var (solutionModel, vsSln, solutionSerializer) = await VsPersistenceSolutionService.ReadSolution(path);
 			timer.Stop();
 			_logger.LogInformation("Solution model fully created in {ElapsedMilliseconds} ms", timer.ElapsedMilliseconds);
+			await _nodeReadyTcs.Task;
+			// Do not use injected services until after _nodeReadyTcs - Services aren't injected until _Ready
+			await _vsPersistenceSolutionService.LoadSolution(path, vsSln, solutionSerializer);
 			_sharpIdeSolutionAccessor.SolutionModel = solutionModel;
 			_sharpIdeSolutionAccessor.SolutionReadyTcs.SetResult();
 			_solutionExplorerPanel.SolutionModel = solutionModel;

src/SharpIDE.Photino/Layout/MainLayout.razor

@@ -184,7 +184,7 @@
 		var solutionFilePath = (string)result.Data!;
 		_solutionFilePath = solutionFilePath;
 
-		var solutionModel = await VsPersistenceSolutionService.LoadSolution(_solutionFilePath);
+		var (solutionModel, _, _) = await VsPersistenceSolutionService.ReadSolution(_solutionFilePath);
 		_solutionModel = solutionModel;
 		RoslynAnalysis.StartLoadingSolutionInWorkspace(solutionModel);
 	}

tests/SharpIDE.Application.IntegrationTests/Features/Analysis/RoslynAnalysisTests.cs

@@ -37,7 +37,7 @@ public async Task GetProjectDiagnostics_NoSolutionChanges_IsSubsequentlyCheaper(
 
 	    var roslynAnalysis = new RoslynAnalysis(logger, buildService, analyzerFileWatcher);
 
-	    var solutionModel = await vsPersistenceSolutionService.LoadSolution(@"C:\Users\Matthew\Documents\Git\SharpIDE\SharpIDE.slnx", TestContext.Current.CancellationToken);
+	    var (solutionModel, _, _) = await VsPersistenceSolutionService.ReadSolution(@"C:\Users\Matthew\Documents\Git\SharpIDE\SharpIDE.slnx", TestContext.Current.CancellationToken);
 	    var sharpIdeApplicationProject = solutionModel.AllProjects.Single(p => p.Name.Value == "SharpIDE.Application");
 
 	    var timer = Stopwatch.StartNew();