Update to new Roslyn APIs

tmat · tmat · commit 84aa7eadb05d · 2024-11-16T14:42:45.000-08:00
diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
@@ -74,7 +74,7 @@ public async ValueTask TerminateNonRootProcessesAndDispose(CancellationToken can
             Dispose();
         }
 
-        public ValueTask RestartSessionAsync(ImmutableDictionary<ProjectId, string> projectsToBeRebuilt, CancellationToken cancellationToken)
+        public void UpdateProjectBaselines(ImmutableDictionary<ProjectId, string> projectsToBeRebuilt, CancellationToken cancellationToken)
         {
             // Remove previous updates to all modules that were affected by rude edits.
             // All running projects that statically reference these modules have been terminated.
@@ -87,9 +87,8 @@ public ValueTask RestartSessionAsync(ImmutableDictionary<ProjectId, string> proj
                 _previousUpdates = _previousUpdates.RemoveAll(update => projectsToBeRebuilt.ContainsKey(update.ProjectId));
             }
 
-            _hotReloadService.EndSession();
-            _reporter.Report(MessageDescriptor.HotReloadSessionEnded);
-            return StartSessionAsync(cancellationToken);
+            _hotReloadService.UpdateBaselines(Workspace.CurrentSolution, projectsToBeRebuilt.Keys.ToImmutableArray());
+            _reporter.Report(MessageDescriptor.ProjectBaselinesUpdates);
         }
 
         public async ValueTask StartSessionAsync(CancellationToken cancellationToken)
@@ -277,14 +276,19 @@ private static void PrepareCompilations(Solution solution, string projectPath, C
         }
 
         public async ValueTask<(ImmutableDictionary<ProjectId, string> projectsToRebuild, ImmutableArray<RunningProject> terminatedProjects)> HandleFileChangesAsync(
-            Func<IEnumerable<Project>, CancellationToken, Task> restartPrompt,
+            Func<IEnumerable<string>, CancellationToken, Task> restartPrompt,
             CancellationToken cancellationToken)
         {
             var currentSolution = Workspace.CurrentSolution;
             var runningProjects = _runningProjects;
 
-            var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, isRunningProject: p => runningProjects.ContainsKey(p.FilePath!), cancellationToken);
-            var anyProcessNeedsRestart = updates.ProjectsToRestart.Count > 0;
+            var runningProjectIds = currentSolution.Projects
+                .Where(project => project.FilePath != null && runningProjects.ContainsKey(project.FilePath))
+                .Select(project => project.Id)
+                .ToImmutableHashSet();
+
+            var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, runningProjectIds, cancellationToken);
+            var anyProcessNeedsRestart = !updates.ProjectIdsToRestart.IsEmpty;
 
             await DisplayResultsAsync(updates, cancellationToken);
 
@@ -302,13 +306,13 @@ private static void PrepareCompilations(Solution solution, string projectPath, C
                     return (ImmutableDictionary<ProjectId, string>.Empty, []);
                 }
 
-                await restartPrompt.Invoke(updates.ProjectsToRestart, cancellationToken);
+                await restartPrompt.Invoke(updates.ProjectIdsToRestart.Select(id => currentSolution.GetProject(id)!.Name), cancellationToken);
 
                 // Terminate all tracked processes that need to be restarted,
                 // except for the root process, which will terminate later on.
-                var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectsToRestart.Select(p => p.FilePath!), cancellationToken);
+                var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectIdsToRestart.Select(id => currentSolution.GetProject(id)!.FilePath!), cancellationToken);
 
-                return (updates.ProjectsToRebuild.ToImmutableDictionary(keySelector: p => p.Id, elementSelector: p => p.FilePath!), terminatedProjects);
+                return (updates.ProjectIdsToRebuild.ToImmutableDictionary(keySelector: id => id, elementSelector: id => currentSolution.GetProject(id)!.FilePath!), terminatedProjects);
             }
 
             Debug.Assert(updates.Status == ModuleUpdateStatus.Ready);
@@ -353,7 +357,7 @@ await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationT
 
         private async ValueTask DisplayResultsAsync(WatchHotReloadService.Updates updates, CancellationToken cancellationToken)
         {
-            var anyProcessNeedsRestart = updates.ProjectsToRestart.Count > 0;
+            var anyProcessNeedsRestart = !updates.ProjectIdsToRestart.IsEmpty;
 
             switch (updates.Status)
             {
diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs
@@ -249,7 +249,7 @@ void FileChangedCallback(string path, ChangeKind kind)
 
                         HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.CompilationHandler);
 
-                        var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projects, cancellationToken) =>
+                        var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projectNames, cancellationToken) =>
                         {
                             if (_rudeEditRestartPrompt != null)
                             {
@@ -265,9 +265,9 @@ void FileChangedCallback(string path, ChangeKind kind)
                                 {
                                     Context.Reporter.Output("Affected projects:");
 
-                                    foreach (var project in projects.OrderBy(p => p.Name))
+                                    foreach (var projectName in projectNames.OrderBy(n => n))
                                     {
-                                        Context.Reporter.Output("  " + project.Name);
+                                        Context.Reporter.Output("  " + projectName);
                                     }
 
                                     question = "Do you want to restart these projects?";
@@ -283,9 +283,9 @@ void FileChangedCallback(string path, ChangeKind kind)
                             {
                                 Context.Reporter.Verbose("Restarting without prompt since dotnet-watch is running in non-interactive mode.");
 
-                                foreach (var project in projects)
+                                foreach (var projectName in projectNames)
                                 {
-                                    Context.Reporter.Verbose($"  Project to restart: '{project.Name}'");
+                                    Context.Reporter.Verbose($"  Project to restart: '{projectName}'");
                                 }
                             }
                         }, iterationCancellationToken);
@@ -341,8 +341,8 @@ void FileChangedCallback(string path, ChangeKind kind)
                             // Apply them to the workspace.
                             _ = await CaptureChangedFilesSnapshot(projectsToRebuild);
 
-                            // Restart session to capture new baseline that reflects the changes to the restarted projects.
-                            await compilationHandler.RestartSessionAsync(projectsToRebuild, iterationCancellationToken);
+                            // Update project baselines to reflect changes to the restarted projects.
+                            compilationHandler.UpdateProjectBaselines(projectsToRebuild, iterationCancellationToken);
                         }
 
                         if (projectsToRestart is not [])
diff --git a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs
@@ -55,7 +55,7 @@ public bool TryGetMessage(string? prefix, object?[] args, [NotNullWhen(true)] ou
         // predefined messages used for testing:
         public static readonly MessageDescriptor HotReloadSessionStarting = new(Format: null, Emoji: null, MessageSeverity.None, s_id++);
         public static readonly MessageDescriptor HotReloadSessionStarted = new("Hot reload session started.", "🔥", MessageSeverity.Verbose, s_id++);
-        public static readonly MessageDescriptor HotReloadSessionEnded = new("Hot reload session ended.", "🔥", MessageSeverity.Verbose, s_id++);
+        public static readonly MessageDescriptor ProjectBaselinesUpdates = new("Project baselines updated.", "🔥", MessageSeverity.Verbose, s_id++);
         public static readonly MessageDescriptor FixBuildError = new("Fix the error to continue or press Ctrl+C to exit.", "⌚", MessageSeverity.Warning, s_id++);
         public static readonly MessageDescriptor WaitingForChanges = new("Waiting for changes", "⌚", MessageSeverity.Verbose, s_id++);
         public static readonly MessageDescriptor LaunchedProcess = new("Launched '{0}' with arguments '{1}': process id {2}", "🚀", MessageSeverity.Verbose, s_id++);
diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs
@@ -409,7 +409,6 @@ public async Task Aspire()
             Assert.Equal(1, App.Process.Output.Count(line => line.StartsWith("dotnet watch ⌚ Launching browser: ")));
             App.Process.ClearOutput();
 
-#if TODO // needs Roslyn update
             // rude edit with build error:
             UpdateSourceFile(
                 serviceSourcePath,
@@ -441,16 +440,6 @@ public async Task Aspire()
             App.AssertOutputContains("error CS0246: The type or namespace name 'WeatherForecast' could not be found");
             App.Process.ClearOutput();
 
-            // TODO: remove
-            Log("dotnet build-server shutdown");
-            var workloadInstallCommandSpec = new DotnetCommand(Logger, ["build-server", "shutdown"])
-            {
-                WorkingDirectory = testAsset.Path,
-            };
-
-            var result = workloadInstallCommandSpec.Execute();
-            Assert.Equal(0, result.ExitCode);
-
             // fix build error:
             UpdateSourceFile(
                 serviceSourcePath,
@@ -459,8 +448,9 @@ public async Task Aspire()
             await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Capabilities");
 
             App.AssertOutputContains("dotnet watch ⌚ Build succeeded.");
+            App.AssertOutputContains("dotnet watch 🔥 Project baselines updated.");
             App.AssertOutputContains($"dotnet watch ⭐ Starting project: {serviceProjectPath}");
-#endif
+
             App.SendControlC();
 
             await App.AssertOutputLineStartsWith("dotnet watch 🛑 Shutdown requested. Press Ctrl+C again to force exit.");

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public async ValueTask TerminateNonRootProcessesAndDispose(CancellationToken can`
`74`	`74`	`Dispose();`
`75`	`75`	`}`
`76`	`76`
`77`		`- public ValueTask RestartSessionAsync(ImmutableDictionary<ProjectId, string> projectsToBeRebuilt, CancellationToken cancellationToken)`
	`77`	`+ public void UpdateProjectBaselines(ImmutableDictionary<ProjectId, string> projectsToBeRebuilt, CancellationToken cancellationToken)`
`78`	`78`	`{`
`79`	`79`	`// Remove previous updates to all modules that were affected by rude edits.`
`80`	`80`	`// All running projects that statically reference these modules have been terminated.`
`@@ -87,9 +87,8 @@ public ValueTask RestartSessionAsync(ImmutableDictionary<ProjectId, string> proj`
`87`	`87`	`_previousUpdates = _previousUpdates.RemoveAll(update => projectsToBeRebuilt.ContainsKey(update.ProjectId));`
`88`	`88`	`}`
`89`	`89`
`90`		`- _hotReloadService.EndSession();`
`91`		`- _reporter.Report(MessageDescriptor.HotReloadSessionEnded);`
`92`		`- return StartSessionAsync(cancellationToken);`
	`90`	`+ _hotReloadService.UpdateBaselines(Workspace.CurrentSolution, projectsToBeRebuilt.Keys.ToImmutableArray());`
	`91`	`+ _reporter.Report(MessageDescriptor.ProjectBaselinesUpdates);`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`public async ValueTask StartSessionAsync(CancellationToken cancellationToken)`
`@@ -277,14 +276,19 @@ private static void PrepareCompilations(Solution solution, string projectPath, C`
`277`	`276`	`}`
`278`	`277`
`279`	`278`	`public async ValueTask<(ImmutableDictionary<ProjectId, string> projectsToRebuild, ImmutableArray<RunningProject> terminatedProjects)> HandleFileChangesAsync(`
`280`		`- Func<IEnumerable<Project>, CancellationToken, Task> restartPrompt,`
	`279`	`+ Func<IEnumerable<string>, CancellationToken, Task> restartPrompt,`
`281`	`280`	`CancellationToken cancellationToken)`
`282`	`281`	`{`
`283`	`282`	`var currentSolution = Workspace.CurrentSolution;`
`284`	`283`	`var runningProjects = _runningProjects;`
`285`	`284`
`286`		`- var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, isRunningProject: p => runningProjects.ContainsKey(p.FilePath!), cancellationToken);`
`287`		`- var anyProcessNeedsRestart = updates.ProjectsToRestart.Count > 0;`
	`285`	`+ var runningProjectIds = currentSolution.Projects`
	`286`	`+ .Where(project => project.FilePath != null && runningProjects.ContainsKey(project.FilePath))`
	`287`	`+ .Select(project => project.Id)`
	`288`	`+ .ToImmutableHashSet();`
	`289`	`+`
	`290`	`+ var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, runningProjectIds, cancellationToken);`
	`291`	`+ var anyProcessNeedsRestart = !updates.ProjectIdsToRestart.IsEmpty;`
`288`	`292`
`289`	`293`	`await DisplayResultsAsync(updates, cancellationToken);`
`290`	`294`
`@@ -302,13 +306,13 @@ private static void PrepareCompilations(Solution solution, string projectPath, C`
`302`	`306`	`return (ImmutableDictionary<ProjectId, string>.Empty, []);`
`303`	`307`	`}`
`304`	`308`
`305`		`- await restartPrompt.Invoke(updates.ProjectsToRestart, cancellationToken);`
	`309`	`+ await restartPrompt.Invoke(updates.ProjectIdsToRestart.Select(id => currentSolution.GetProject(id)!.Name), cancellationToken);`
`306`	`310`
`307`	`311`	`// Terminate all tracked processes that need to be restarted,`
`308`	`312`	`// except for the root process, which will terminate later on.`
`309`		`- var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectsToRestart.Select(p => p.FilePath!), cancellationToken);`
	`313`	`+ var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectIdsToRestart.Select(id => currentSolution.GetProject(id)!.FilePath!), cancellationToken);`
`310`	`314`
`311`		`- return (updates.ProjectsToRebuild.ToImmutableDictionary(keySelector: p => p.Id, elementSelector: p => p.FilePath!), terminatedProjects);`
	`315`	`+ return (updates.ProjectIdsToRebuild.ToImmutableDictionary(keySelector: id => id, elementSelector: id => currentSolution.GetProject(id)!.FilePath!), terminatedProjects);`
`312`	`316`	`}`
`313`	`317`
`314`	`318`	`Debug.Assert(updates.Status == ModuleUpdateStatus.Ready);`
`@@ -353,7 +357,7 @@ await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationT`
`353`	`357`
`354`	`358`	`private async ValueTask DisplayResultsAsync(WatchHotReloadService.Updates updates, CancellationToken cancellationToken)`
`355`	`359`	`{`
`356`		`- var anyProcessNeedsRestart = updates.ProjectsToRestart.Count > 0;`
	`360`	`+ var anyProcessNeedsRestart = !updates.ProjectIdsToRestart.IsEmpty;`
`357`	`361`
`358`	`362`	`switch (updates.Status)`
`359`	`363`	`{`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void FileChangedCallback(string path, ChangeKind kind)`
`249`	`249`
`250`	`250`	`HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.CompilationHandler);`
`251`	`251`
`252`		`- var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projects, cancellationToken) =>`
	`252`	`+ var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projectNames, cancellationToken) =>`
`253`	`253`	`{`
`254`	`254`	`if (_rudeEditRestartPrompt != null)`
`255`	`255`	`{`
`@@ -265,9 +265,9 @@ void FileChangedCallback(string path, ChangeKind kind)`
`265`	`265`	`{`
`266`	`266`	`Context.Reporter.Output("Affected projects:");`
`267`	`267`
`268`		`- foreach (var project in projects.OrderBy(p => p.Name))`
	`268`	`+ foreach (var projectName in projectNames.OrderBy(n => n))`
`269`	`269`	`{`
`270`		`- Context.Reporter.Output(" " + project.Name);`
	`270`	`+ Context.Reporter.Output(" " + projectName);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`question = "Do you want to restart these projects?";`
`@@ -283,9 +283,9 @@ void FileChangedCallback(string path, ChangeKind kind)`
`283`	`283`	`{`
`284`	`284`	`Context.Reporter.Verbose("Restarting without prompt since dotnet-watch is running in non-interactive mode.");`
`285`	`285`
`286`		`- foreach (var project in projects)`
	`286`	`+ foreach (var projectName in projectNames)`
`287`	`287`	`{`
`288`		`- Context.Reporter.Verbose($" Project to restart: '{project.Name}'");`
	`288`	`+ Context.Reporter.Verbose($" Project to restart: '{projectName}'");`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`	`}, iterationCancellationToken);`
`@@ -341,8 +341,8 @@ void FileChangedCallback(string path, ChangeKind kind)`
`341`	`341`	`// Apply them to the workspace.`
`342`	`342`	`_ = await CaptureChangedFilesSnapshot(projectsToRebuild);`
`343`	`343`
`344`		`- // Restart session to capture new baseline that reflects the changes to the restarted projects.`
`345`		`- await compilationHandler.RestartSessionAsync(projectsToRebuild, iterationCancellationToken);`
	`344`	`+ // Update project baselines to reflect changes to the restarted projects.`
	`345`	`+ compilationHandler.UpdateProjectBaselines(projectsToRebuild, iterationCancellationToken);`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`if (projectsToRestart is not [])`