rename service

Author: MattParkerDev

src/SharpIDE.Application/DependencyInjection.cs

@@ -44,7 +44,7 @@ public static IServiceCollection AddApplication(this IServiceCollection services
 		services.AddScoped<EditorCaretPositionService>();
 		services.AddScoped<SharpIdeMetadataAsSourceService>();
 		services.AddScoped<DotnetTemplateService>();
-		services.AddScoped<VsPersistenceSolutionService>();
+		services.AddScoped<SharpIdeSolutionService>();
 		services.AddScoped<FileSystemService>();
 		services.AddLogging();
 		return services;

…sistence/VsPersistenceSolutionService.cs …VsPersistence/SharpIdeSolutionService.cssrc/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceSolutionService.cs renamed to src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/SharpIdeSolutionService.cs src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceSolutionService.cs renamed to src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/SharpIdeSolutionService.cs

@@ -7,7 +7,7 @@
 
 namespace SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 
-public class VsPersistenceSolutionService
+public class SharpIdeSolutionService
 {
 	private SolutionModel? _vsSolution;
 	private ISolutionSerializer? _solutionSerializer;

src/SharpIDE.Godot/Features/NewProject/TemplateComponent.cs

@@ -30,7 +30,7 @@ public partial class TemplateComponent : VBoxContainer
     private ITemplateInfo _selectedTemplate = null!;
 
     [Inject] private readonly DotnetTemplateService _dotnetTemplateService = null!;
-    [Inject] private readonly VsPersistenceSolutionService _vsPersistenceSolutionService = null!;
+    [Inject] private readonly SharpIdeSolutionService _sharpIdeSolutionService = null!;
 
     public override void _Ready()
     {
@@ -63,7 +63,7 @@ public override void _Ready()
                 await _dotnetTemplateService.ExecuteTemplate(_selectedTemplate, projectName, path, []);
                 var projectFilePath = Path.Combine(path, $"{projectName}.csproj");
                 Guard.Against.Null(SlnFolder);
-                await _vsPersistenceSolutionService.AddProject(SlnFolder, projectName, projectFilePath);
+                await _sharpIdeSolutionService.AddProject(SlnFolder, projectName, projectFilePath);
             });
             GetWindow().QueueFree();
         };

src/SharpIDE.Godot/IdeRoot.cs

@@ -52,7 +52,7 @@ public partial class IdeRoot : Control
     [Inject] private readonly SharpIdeRootFolderModificationService _rootFolderModificationService = null!;
     [Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
     [Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
-    [Inject] private readonly VsPersistenceSolutionService _vsPersistenceSolutionService = null!;
+    [Inject] private readonly SharpIdeSolutionService _sharpIdeSolutionService = null!;
     [Inject] private readonly ILogger<IdeRoot> _logger = null!;
 
 	public override void _EnterTree()
@@ -155,12 +155,12 @@ public void SetSlnFilePath(string path)
 			GD.Print($"Selected: {path}");
 			var timer = Stopwatch.StartNew();
 			var sharpIdeRootFolder = await FileSystemService.GetSharpIdeRootFolderForSolutionAsync(path);
-			var (solutionModel, vsSln, solutionSerializer) = await VsPersistenceSolutionService.ReadSolution(path, sharpIdeRootFolder);
+			var (solutionModel, vsSln, solutionSerializer) = await SharpIdeSolutionService.ReadSolution(path, sharpIdeRootFolder);
 			timer.Stop();
 			await _nodeReadyTcs.Task;
 			// Do not use injected services until after _nodeReadyTcs - Services aren't injected until _Ready
 			_logger.LogInformation("Solution model fully created in {ElapsedMilliseconds} ms", timer.ElapsedMilliseconds);
-			await _vsPersistenceSolutionService.LoadSolution(path, vsSln, solutionSerializer);
+			await _sharpIdeSolutionService.LoadSolution(path, vsSln, solutionSerializer);
 			_sharpIdeSolutionAccessor.SolutionModel = solutionModel;
 			_sharpIdeSolutionAccessor.SolutionReadyTcs.SetResult();
 			_solutionExplorerPanel.SolutionModel = solutionModel;

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

@@ -34,13 +34,13 @@ public async Task GetProjectDiagnostics_NoSolutionChanges_IsSubsequentlyCheaper(
 	    var logger = services.GetRequiredService<ILogger<RoslynAnalysis>>();
 	    var buildService = services.GetRequiredService<BuildService>();
 	    var analyzerFileWatcher = services.GetRequiredService<AnalyzerFileWatcher>();
-	    var vsPersistenceSolutionService = services.GetRequiredService<VsPersistenceSolutionService>();
+	    var vsPersistenceSolutionService = services.GetRequiredService<SharpIdeSolutionService>();
 
 	    var roslynAnalysis = new RoslynAnalysis(logger, buildService, analyzerFileWatcher);
 
 	    var slnFolderPath = @"C:\Users\Matthew\Documents\Git\SharpIDE\SharpIDE.slnx";
 	    var rootFolder = await FileSystemService.GetSharpIdeRootFolderForSolutionAsync(slnFolderPath);
-	    var (solutionModel, _, _) = await VsPersistenceSolutionService.ReadSolution(slnFolderPath, rootFolder, TestContext.Current.CancellationToken);
+	    var (solutionModel, _, _) = await SharpIdeSolutionService.ReadSolution(slnFolderPath, rootFolder, TestContext.Current.CancellationToken);
 	    var sharpIdeApplicationProject = solutionModel.AllProjects.Single(p => p.Name.Value == "SharpIDE.Application");
 
 	    var timer = Stopwatch.StartNew();