Update ProjectWorkspaceState and HostProject at the same time

Author: davidwengier

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorLanguageServerBenchmarkBase.cs

@@ -76,7 +76,7 @@ await projectManager.UpdateAsync(
                 updater.ProjectAdded(hostProject);
                 var tagHelpers = CommonResources.LegacyTagHelpers;
                 var projectWorkspaceState = ProjectWorkspaceState.Create(tagHelpers, CodeAnalysis.CSharp.LanguageVersion.CSharp11);
-                updater.ProjectWorkspaceStateChanged(hostProject.Key, projectWorkspaceState);
+                updater.ProjectChanged(hostProject, projectWorkspaceState);
                 updater.DocumentAdded(hostProject.Key, hostDocument, textLoader);
             },
             CancellationToken.None);

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs

@@ -369,34 +369,21 @@ private Task AddOrUpdateProjectCoreAsync(
                     _logger.LogInformation($"Updating project '{project.Key}' TagHelpers ({projectWorkspaceState.TagHelpers.Length}) and C# Language Version ({projectWorkspaceState.CSharpLanguageVersion}).");
                 }
 
-                updater.ProjectWorkspaceStateChanged(project.Key, projectWorkspaceState);
-
                 var currentConfiguration = project.Configuration;
                 var currentRootNamespace = project.RootNamespace;
-                if (currentConfiguration.ConfigurationName == configuration?.ConfigurationName &&
-                    currentRootNamespace == rootNamespace)
-                {
-                    _logger.LogTrace($"Updating project '{project.Key}'. The project is already using configuration '{configuration.ConfigurationName}' and root namespace '{rootNamespace}'.");
-                    return;
-                }
-
                 if (configuration is null)
                 {
                     configuration = FallbackRazorConfiguration.Latest;
                     _logger.LogInformation($"Updating project '{project.Key}' to use the latest configuration ('{configuration.ConfigurationName}')'.");
                 }
-                else if (currentConfiguration.ConfigurationName != configuration.ConfigurationName)
-                {
-                    _logger.LogInformation($"Updating project '{project.Key}' to Razor configuration '{configuration.ConfigurationName}' with language version '{configuration.LanguageVersion}'.");
-                }
-
-                if (currentRootNamespace != rootNamespace)
+                else if (currentConfiguration.Equals(configuration) &&
+                    currentRootNamespace == rootNamespace)
                 {
-                    _logger.LogInformation($"Updating project '{project.Key}''s root namespace to '{rootNamespace}'.");
+                    _logger.LogTrace($"Updating project '{project.Key}'. The project is already using configuration '{configuration.ConfigurationName}' and root namespace '{rootNamespace}'.");
                 }
 
                 var hostProject = new HostProject(project.FilePath, project.IntermediateOutputPath, configuration, rootNamespace, displayName);
-                updater.ProjectConfigurationChanged(hostProject);
+                updater.ProjectChanged(hostProject, projectWorkspaceState);
             },
             cancellationToken);
     }

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs

@@ -150,15 +150,6 @@ public bool TryGetTextVersion(out VersionStamp result)
         return false;
     }
 
-    public virtual DocumentState WithConfigurationChange()
-    {
-        var state = new DocumentState(HostDocument, Version + 1, _textAndVersion, _textLoader);
-
-        // Do not cache computed state
-
-        return state;
-    }
-
     public virtual DocumentState WithImportsChange()
     {
         var state = new DocumentState(HostDocument, Version + 1, _textAndVersion, _textLoader);
@@ -169,7 +160,7 @@ public virtual DocumentState WithImportsChange()
         return state;
     }
 
-    public virtual DocumentState WithProjectWorkspaceStateChange()
+    public virtual DocumentState WithProjectChange()
     {
         var state = new DocumentState(HostDocument, Version + 1, _textAndVersion, _textLoader);
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectDifference.cs

@@ -8,10 +8,9 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 [Flags]
 internal enum ProjectDifference
 {
-    None = 0,
-    ConfigurationChanged = 1,
-    ProjectWorkspaceStateChanged = 2,
-    DocumentAdded = 4,
-    DocumentRemoved = 8,
-    DocumentChanged = 16,
+    None = 1 << 0,
+    ConfigurationChanged = 1 << 1,
+    DocumentAdded = 1 << 2,
+    DocumentRemoved = 1 << 3,
+    DocumentChanged = 1 << 4,
 }

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManager.Updater.cs

@@ -50,11 +50,8 @@ public void ProjectAdded(HostProject project)
         public void ProjectRemoved(ProjectKey projectKey)
             => instance.ProjectRemoved(projectKey);
 
-        public void ProjectConfigurationChanged(HostProject project)
-            => instance.ProjectConfigurationChanged(project);
-
-        public void ProjectWorkspaceStateChanged(ProjectKey projectKey, ProjectWorkspaceState projectWorkspaceState)
-            => instance.ProjectWorkspaceStateChanged(projectKey, projectWorkspaceState);
+        public void ProjectChanged(HostProject project, ProjectWorkspaceState projectWorkspaceState)
+            => instance.ProjectChanged(project, projectWorkspaceState);
 
         public void SolutionOpened()
             => instance.SolutionOpened();

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManager.cs

@@ -306,7 +306,7 @@ private void ProjectAdded(HostProject hostProject)
         }
     }
 
-    private void ProjectConfigurationChanged(HostProject hostProject)
+    private void ProjectChanged(HostProject hostProject, ProjectWorkspaceState projectWorkspaceState)
     {
         if (_initialized)
         {
@@ -316,25 +316,7 @@ private void ProjectConfigurationChanged(HostProject hostProject)
         if (TryUpdate(
             hostProject.Key,
             documentFilePath: null,
-            new HostProjectUpdatedAction(hostProject),
-            out var oldSnapshot,
-            out var newSnapshot))
-        {
-            NotifyListeners(oldSnapshot, newSnapshot, documentFilePath: null, ProjectChangeKind.ProjectChanged);
-        }
-    }
-
-    private void ProjectWorkspaceStateChanged(ProjectKey projectKey, ProjectWorkspaceState projectWorkspaceState)
-    {
-        if (_initialized)
-        {
-            _dispatcher.AssertRunningOnDispatcher();
-        }
-
-        if (TryUpdate(
-            projectKey,
-            documentFilePath: null,
-            new ProjectWorkspaceStateChangedAction(projectWorkspaceState),
+            new ProjectChangeAction(hostProject, projectWorkspaceState),
             out var oldSnapshot,
             out var newSnapshot))
         {
@@ -591,11 +573,8 @@ private static Entry ComputeNewEntry(Entry originalEntry, IUpdateProjectAction a
                     }
                 }
 
-            case ProjectWorkspaceStateChangedAction(var workspaceState):
-                return new Entry(originalEntry.State.WithProjectWorkspaceState(workspaceState));
-
-            case HostProjectUpdatedAction(var hostProject):
-                return new Entry(originalEntry.State.WithHostProject(hostProject));
+            case ProjectChangeAction(var hostProject, var workspaceState):
+                return new Entry(originalEntry.State.WithHostProjectAndWorkspaceState(hostProject, workspaceState));
 
             default:
                 throw new InvalidOperationException($"Unexpected action type {action.GetType()}");

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs

@@ -20,12 +20,6 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 // Internal tracker for DefaultProjectSnapshot
 internal class ProjectState
 {
-    private const ProjectDifference ClearConfigurationVersionMask = ProjectDifference.ConfigurationChanged;
-
-    private const ProjectDifference ClearProjectWorkspaceStateVersionMask =
-        ProjectDifference.ConfigurationChanged |
-        ProjectDifference.ProjectWorkspaceStateChanged;
-
     private const ProjectDifference ClearDocumentCollectionVersionMask =
         ProjectDifference.ConfigurationChanged |
         ProjectDifference.DocumentAdded |
@@ -96,7 +90,9 @@ private ProjectState(
             DocumentCollectionVersion = Version;
         }
 
-        if ((difference & ClearConfigurationVersionMask) == 0 && older._projectEngine != null)
+        if (older._projectEngine != null &&
+            HostProject.Configuration == older.HostProject.Configuration &&
+            CSharpLanguageVersion == older.CSharpLanguageVersion)
         {
             // Optimistically cache the RazorProjectEngine.
             _projectEngine = older.ProjectEngine;
@@ -107,24 +103,14 @@ private ProjectState(
             ConfigurationVersion = Version;
         }
 
-        if ((difference & ClearProjectWorkspaceStateVersionMask) == 0 ||
-            ProjectWorkspaceState == older.ProjectWorkspaceState ||
-            ProjectWorkspaceState.Equals(older.ProjectWorkspaceState))
+        if (ProjectWorkspaceState.Equals(older.ProjectWorkspaceState))
         {
             ProjectWorkspaceStateVersion = older.ProjectWorkspaceStateVersion;
         }
         else
         {
             ProjectWorkspaceStateVersion = Version;
         }
-
-        if ((difference & ClearProjectWorkspaceStateVersionMask) != 0 &&
-            CSharpLanguageVersion != older.CSharpLanguageVersion)
-        {
-            // C# language version changed. This impacts the ProjectEngine, reset it.
-            _projectEngine = null;
-            ConfigurationVersion = Version;
-        }
     }
 
     // Internal set for testing.
@@ -314,20 +300,16 @@ public ProjectState WithChangedHostDocument(HostDocument hostDocument, TextLoade
         return state;
     }
 
-    public ProjectState WithHostProject(HostProject hostProject)
+    public ProjectState WithHostProjectAndWorkspaceState(HostProject hostProject, ProjectWorkspaceState projectWorkspaceState)
     {
-        if (hostProject is null)
-        {
-            throw new ArgumentNullException(nameof(hostProject));
-        }
-
         if (HostProject.Configuration.Equals(hostProject.Configuration) &&
-            HostProject.RootNamespace == hostProject.RootNamespace)
+            HostProject.RootNamespace == hostProject.RootNamespace &&
+            ProjectWorkspaceState.Equals(projectWorkspaceState))
         {
             return this;
         }
 
-        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithConfigurationChange(), FilePathNormalizingComparer.Instance);
+        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithProjectChange(), FilePathNormalizingComparer.Instance);
 
         // If the host project has changed then we need to recompute the imports map
         var importsToRelatedDocuments = s_emptyImportsToRelatedDocuments;
@@ -338,25 +320,7 @@ public ProjectState WithHostProject(HostProject hostProject)
             importsToRelatedDocuments = AddToImportsToRelatedDocuments(importsToRelatedDocuments, document.Value.HostDocument.FilePath, importTargetPaths);
         }
 
-        var state = new ProjectState(this, ProjectDifference.ConfigurationChanged, hostProject, ProjectWorkspaceState, documents, importsToRelatedDocuments);
-        return state;
-    }
-
-    public ProjectState WithProjectWorkspaceState(ProjectWorkspaceState projectWorkspaceState)
-    {
-        if (ProjectWorkspaceState == projectWorkspaceState)
-        {
-            return this;
-        }
-
-        if (ProjectWorkspaceState.Equals(projectWorkspaceState))
-        {
-            return this;
-        }
-
-        var difference = ProjectDifference.ProjectWorkspaceStateChanged;
-        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithProjectWorkspaceStateChange(), FilePathNormalizingComparer.Instance);
-        var state = new ProjectState(this, difference, HostProject, projectWorkspaceState, documents, ImportsToRelatedDocuments);
+        var state = new ProjectState(this, ProjectDifference.ConfigurationChanged, hostProject, projectWorkspaceState, documents, importsToRelatedDocuments);
         return state;
     }
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/UpdateProjectAction.cs

@@ -30,6 +30,4 @@ internal record ProjectAddedAction(HostProject HostProject) : IUpdateProjectActi
 
 internal record ProjectRemovedAction(ProjectKey ProjectKey) : IUpdateProjectAction;
 
-internal record HostProjectUpdatedAction(HostProject HostProject) : IUpdateProjectAction;
-
-internal record ProjectWorkspaceStateChangedAction(ProjectWorkspaceState WorkspaceState) : IUpdateProjectAction;
+internal record ProjectChangeAction(HostProject HostProject, ProjectWorkspaceState WorkspaceState) : IUpdateProjectAction;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/ProjectSnapshotSynchronizationService.cs

@@ -85,7 +85,7 @@ await _projectManager.UpdateAsync(
 
                     if (state.projectWorkspaceState != null)
                     {
-                        updater.ProjectWorkspaceStateChanged(state.hostProject.Key, state.projectWorkspaceState);
+                        updater.ProjectChanged(state.hostProject, state.projectWorkspaceState);
                     }
                 },
                 state: (hostProject, projectWorkspaceState: args.Newer.ProjectWorkspaceState),
@@ -108,31 +108,16 @@ await _projectManager.UpdateAsync(
         }
         else if (args.Kind == ProjectProxyChangeKind.ProjectChanged)
         {
-            if (!args.Older!.Configuration.Equals(args.Newer!.Configuration))
+            if (!args.Older!.Configuration.Equals(args.Newer!.Configuration) ||
+                !args.Older.ProjectWorkspaceState.Equals(args.Newer.ProjectWorkspaceState))
             {
                 var guestPath = ResolveGuestPath(args.Newer.FilePath);
                 var guestIntermediateOutputPath = ResolveGuestPath(args.Newer.IntermediateOutputPath);
                 var hostProject = new HostProject(guestPath, guestIntermediateOutputPath, args.Newer.Configuration, args.Newer.RootNamespace);
+                var projectWorkspaceState = args.Newer.ProjectWorkspaceState;
                 await _projectManager.UpdateAsync(
-                    static (updater, hostProject) => updater.ProjectConfigurationChanged(hostProject),
-                    state: hostProject,
-                    CancellationToken.None);
-            }
-            else if (args.Older.ProjectWorkspaceState != args.Newer.ProjectWorkspaceState ||
-                args.Older.ProjectWorkspaceState?.Equals(args.Newer.ProjectWorkspaceState) == false)
-            {
-                var guestPath = ResolveGuestPath(args.Newer.FilePath);
-                await _projectManager.UpdateAsync(
-                    static (updater, state) =>
-                    {
-                        var projectKeys = updater.GetAllProjectKeys(state.guestPath);
-
-                        foreach (var projectKey in projectKeys)
-                        {
-                            updater.ProjectWorkspaceStateChanged(projectKey, state.projectWorkspaceState);
-                        }
-                    },
-                    state: (guestPath, projectWorkspaceState: args.Newer.ProjectWorkspaceState),
+                    static (updater, state) => updater.ProjectChanged(state.hostProject, state.projectWorkspaceState),
+                    state: (hostProject, projectWorkspaceState),
                     CancellationToken.None);
             }
         }
@@ -152,7 +137,7 @@ await _projectManager.UpdateAsync(
 
                     if (state.projectWorkspaceState is not null)
                     {
-                        updater.ProjectWorkspaceStateChanged(state.hostProject.Key, state.projectWorkspaceState);
+                        updater.ProjectChanged(state.hostProject, state.projectWorkspaceState);
                     }
                 },
                 state: (hostProject, projectWorkspaceState: projectHandle.ProjectWorkspaceState),

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/WindowsRazorProjectHostBase.cs

@@ -265,7 +265,7 @@ protected Task UpdateAsync(Action<ProjectSnapshotManager.Updater> action, Cancel
 
     protected static void UpdateProject(ProjectSnapshotManager.Updater updater, HostProject project)
     {
-        if (!updater.TryGetLoadedProject(project.Key, out _))
+        if (!updater.TryGetLoadedProject(project.Key, out var current))
         {
             // Just in case we somehow got in a state where VS didn't tell us that solution close was finished, lets just
             // ensure we're going to actually do something with the new project that we've just been told about.
@@ -275,7 +275,7 @@ protected static void UpdateProject(ProjectSnapshotManager.Updater updater, Host
         }
         else
         {
-            updater.ProjectConfigurationChanged(project);
+            updater.ProjectChanged(project, current.ProjectWorkspaceState);
         }
     }