Further refactoring of Razor tooling project system

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

@@ -12,7 +12,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-internal partial class DocumentState
+internal sealed partial class DocumentState
 {
     private static readonly LoadTextOptions s_loadTextOptions = new(SourceHashAlgorithm.Sha256);
 
@@ -42,14 +42,7 @@ private DocumentState(
         _textLoader = textLoader ?? EmptyLoader;
     }
 
-    // Internal for testing
-    internal DocumentState(HostDocument hostDocument, int version, SourceText text, VersionStamp textVersion)
-        : this(hostDocument, version, TextAndVersion.Create(text, textVersion), textLoader: null)
-    {
-    }
-
-    // Internal for testing
-    internal DocumentState(HostDocument hostDocument, int version, TextLoader loader)
+    private DocumentState(HostDocument hostDocument, int version, TextLoader loader)
         : this(hostDocument, version, textAndVersion: null, loader)
     {
     }
@@ -161,16 +154,13 @@ public bool TryGetTextVersion(out VersionStamp result)
         return false;
     }
 
-    public virtual DocumentState WithConfigurationChange()
+    public DocumentState WithConfigurationChange()
     {
-        var state = new DocumentState(HostDocument, Version + 1, _textAndVersion, _textLoader);
-
         // Do not cache computed state
-
-        return state;
+        return new(HostDocument, Version + 1, _textAndVersion, _textLoader);
     }
 
-    public virtual DocumentState WithImportsChange()
+    public DocumentState WithImportsChange()
     {
         var state = new DocumentState(HostDocument, Version + 1, _textAndVersion, _textLoader);
 
@@ -180,7 +170,7 @@ public virtual DocumentState WithImportsChange()
         return state;
     }
 
-    public virtual DocumentState WithProjectWorkspaceStateChange()
+    public DocumentState WithProjectWorkspaceStateChange()
     {
         var state = new DocumentState(HostDocument, Version + 1, _textAndVersion, _textLoader);
 
@@ -190,18 +180,16 @@ public virtual DocumentState WithProjectWorkspaceStateChange()
         return state;
     }
 
-    public virtual DocumentState WithText(SourceText text, VersionStamp textVersion)
+    public DocumentState WithText(SourceText text, VersionStamp textVersion)
     {
         // Do not cache the computed state
-
-        return new DocumentState(HostDocument, Version + 1, TextAndVersion.Create(text, textVersion), textLoader: null);
+        return new(HostDocument, Version + 1, TextAndVersion.Create(text, textVersion), textLoader: null);
     }
 
-    public virtual DocumentState WithTextLoader(TextLoader textLoader)
+    public DocumentState WithTextLoader(TextLoader textLoader)
     {
         // Do not cache the computed state
-
-        return new DocumentState(HostDocument, Version + 1, textAndVersion: null, textLoader);
+        return new(HostDocument, Version + 1, textAndVersion: null, textLoader);
     }
 
     internal static async Task<RazorCodeDocument> GenerateCodeDocumentAsync(

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

@@ -19,8 +19,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-// Internal tracker for DefaultProjectSnapshot
-internal class ProjectState
+internal sealed class ProjectState
 {
     private const ProjectDifference ClearConfigurationVersionMask = ProjectDifference.ConfigurationChanged;
 
@@ -41,6 +40,9 @@ internal class ProjectState
     public RazorCompilerOptions CompilerOptions { get; }
     public ProjectWorkspaceState ProjectWorkspaceState { get; }
 
+    public ImmutableDictionary<string, DocumentState> Documents { get; }
+    public ImmutableDictionary<string, ImmutableArray<string>> ImportsToRelatedDocuments { get; }
+
     private readonly IProjectEngineFactoryProvider _projectEngineFactoryProvider;
     private RazorProjectEngine? _projectEngine;
 
@@ -123,26 +125,28 @@ private ProjectState(
 
     public static ProjectState Create(
         HostProject hostProject,
-        ProjectWorkspaceState? projectWorkspaceState = null,
-        RazorCompilerOptions compilerOptions = RazorCompilerOptions.None,
-        IProjectEngineFactoryProvider? projectEngineFactoryProvider = null)
-        => new(
-            hostProject,
-            projectWorkspaceState ?? ProjectWorkspaceState.Default,
-            compilerOptions,
-            projectEngineFactoryProvider ?? ProjectEngineFactories.DefaultProvider);
+        ProjectWorkspaceState projectWorkspaceState,
+        RazorCompilerOptions compilerOptions,
+        IProjectEngineFactoryProvider projectEngineFactoryProvider)
+        => new(hostProject, projectWorkspaceState, compilerOptions, projectEngineFactoryProvider);
+
+    public static ProjectState Create(HostProject hostProject, ProjectWorkspaceState projectWorkspaceState)
+        => new(hostProject, projectWorkspaceState, RazorCompilerOptions.None, ProjectEngineFactories.DefaultProvider);
 
     public static ProjectState Create(
         HostProject hostProject,
-        RazorCompilerOptions compilerOptions,
-        IProjectEngineFactoryProvider? projectEngineFactoryProvider = null)
-        => Create(hostProject, ProjectWorkspaceState.Default, compilerOptions, projectEngineFactoryProvider);
+        ProjectWorkspaceState projectWorkspaceState,
+        IProjectEngineFactoryProvider projectEngineFactoryProvider)
+        => new(hostProject, projectWorkspaceState, RazorCompilerOptions.None, projectEngineFactoryProvider);
 
-    // Internal set for testing.
-    public ImmutableDictionary<string, DocumentState> Documents { get; internal set; }
+    public static ProjectState Create(
+        HostProject hostProject,
+        RazorCompilerOptions compilerOptions,
+        IProjectEngineFactoryProvider projectEngineFactoryProvider)
+        => new(hostProject, ProjectWorkspaceState.Default, compilerOptions, projectEngineFactoryProvider);
 
-    // Internal set for testing.
-    public ImmutableDictionary<string, ImmutableArray<string>> ImportsToRelatedDocuments { get; internal set; }
+    public static ProjectState Create(HostProject hostProject)
+        => new(hostProject, ProjectWorkspaceState.Default, RazorCompilerOptions.None, ProjectEngineFactories.DefaultProvider);
 
     public ImmutableArray<TagHelperDescriptor> TagHelpers => ProjectWorkspaceState.TagHelpers;
 
@@ -198,6 +202,9 @@ RazorProjectEngine CreateProjectEngine()
 
     public VersionStamp ConfigurationVersion { get; }
 
+    public ProjectState AddDocument(HostDocument hostDocument)
+        => AddDocument(hostDocument, DocumentState.EmptyLoader);
+
     public ProjectState AddDocument(HostDocument hostDocument, SourceText text)
     {
         ArgHelper.ThrowIfNull(hostDocument);

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestDocumentSnapshot.cs

@@ -38,7 +38,7 @@ public static TestDocumentSnapshot Create(string filePath, string text, ProjectW
         var sourceText = SourceText.From(text);
         var textVersion = VersionStamp.Default;
 
-        var documentState = new DocumentState(hostDocument, version, sourceText, textVersion);
+        var documentState = DocumentState.Create(hostDocument, version, sourceText, textVersion);
 
         return new TestDocumentSnapshot(project, documentState);
     }
@@ -54,7 +54,7 @@ public static TestDocumentSnapshot Create(string filePath, RazorCodeDocument cod
         var sourceText = codeDocument.Source.Text;
         var textVersion = VersionStamp.Default;
 
-        var documentState = new DocumentState(hostDocument, version, sourceText, textVersion);
+        var documentState = DocumentState.Create(hostDocument, version, sourceText, textVersion);
 
         return new TestDocumentSnapshot(project, documentState, codeDocument);
     }

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestProjectSnapshot.cs

@@ -27,7 +27,7 @@ private TestProjectSnapshot(ProjectState state)
     public static TestProjectSnapshot Create(string filePath, ProjectWorkspaceState? projectWorkspaceState = null)
     {
         var hostProject = TestHostProject.Create(filePath);
-        var state = ProjectState.Create(hostProject, projectWorkspaceState);
+        var state = ProjectState.Create(hostProject, projectWorkspaceState ?? ProjectWorkspaceState.Default);
 
         return new TestProjectSnapshot(state);
     }