Self-versioned documents

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

@@ -17,6 +17,8 @@ internal class DocumentSnapshot : IDocumentSnapshot
     public IProjectSnapshot Project => ProjectInternal;
     public bool SupportsOutput => true;
 
+    public int Version => State.Version;
+
     public ProjectSnapshot ProjectInternal { get; }
     public DocumentState State { get; }
 

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

@@ -28,34 +28,51 @@ internal partial class DocumentState
     private Task<TextAndVersion>? _loaderTask;
     private SourceText? _sourceText;
     private VersionStamp? _version;
+    private readonly int _numericVersion;
 
     public static DocumentState Create(
         HostDocument hostDocument,
+        int numericVersion,
         Func<Task<TextAndVersion>>? loader)
     {
         if (hostDocument is null)
         {
             throw new ArgumentNullException(nameof(hostDocument));
         }
 
-        return new DocumentState(hostDocument, null, null, loader);
+        return new DocumentState(hostDocument, null, null, numericVersion, loader);
+    }
+
+    public static DocumentState Create(
+      HostDocument hostDocument,
+      Func<Task<TextAndVersion>>? loader)
+    {
+        if (hostDocument is null)
+        {
+            throw new ArgumentNullException(nameof(hostDocument));
+        }
+
+        return new DocumentState(hostDocument, null, null, 1, loader);
     }
 
     // Internal for testing
     internal DocumentState(
         HostDocument hostDocument,
         SourceText? text,
         VersionStamp? version,
+        int numericVersion,
         Func<Task<TextAndVersion>>? loader)
     {
         HostDocument = hostDocument;
         _sourceText = text;
         _version = version;
+        _numericVersion = numericVersion;
         _loader = loader ?? EmptyLoader;
         _lock = new object();
     }
 
     public HostDocument HostDocument { get; }
+    public int Version => _numericVersion;
 
     public bool IsGeneratedOutputResultAvailable => ComputedState.IsResultAvailable == true;
 
@@ -152,12 +169,12 @@ public bool TryGetTextVersion(out VersionStamp result)
 
     public virtual DocumentState WithConfigurationChange()
     {
-        var state = new DocumentState(HostDocument, _sourceText, _version, _loader)
+        var state = new DocumentState(HostDocument, _sourceText, _version, _numericVersion + 1, _loader)
         {
             // The source could not have possibly changed.
             _sourceText = _sourceText,
             _version = _version,
-            _loaderTask = _loaderTask
+            _loaderTask = _loaderTask,
         };
 
         // Do not cache computed state
@@ -167,7 +184,7 @@ public virtual DocumentState WithConfigurationChange()
 
     public virtual DocumentState WithImportsChange()
     {
-        var state = new DocumentState(HostDocument, _sourceText, _version, _loader)
+        var state = new DocumentState(HostDocument, _sourceText, _version, _numericVersion + 1, _loader)
         {
             // The source could not have possibly changed.
             _sourceText = _sourceText,
@@ -183,7 +200,7 @@ public virtual DocumentState WithImportsChange()
 
     public virtual DocumentState WithProjectWorkspaceStateChange()
     {
-        var state = new DocumentState(HostDocument, _sourceText, _version, _loader)
+        var state = new DocumentState(HostDocument, _sourceText, _version, _numericVersion + 1, _loader)
         {
             // The source could not have possibly changed.
             _sourceText = _sourceText,
@@ -206,7 +223,7 @@ public virtual DocumentState WithText(SourceText sourceText, VersionStamp versio
 
         // Do not cache the computed state
 
-        return new DocumentState(HostDocument, sourceText, version, null);
+        return new DocumentState(HostDocument, sourceText, version, _numericVersion + 1, null);
     }
 
     public virtual DocumentState WithTextLoader(Func<Task<TextAndVersion>> loader)
@@ -218,7 +235,7 @@ public virtual DocumentState WithTextLoader(Func<Task<TextAndVersion>> loader)
 
         // Do not cache the computed state
 
-        return new DocumentState(HostDocument, null, null, loader);
+        return new DocumentState(HostDocument, null, null, _numericVersion + 1, loader);
     }
 
     // Internal, because we are temporarily sharing code with CohostDocumentSnapshot

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

@@ -16,6 +16,8 @@ internal interface IDocumentSnapshot
     IProjectSnapshot Project { get; }
     bool SupportsOutput { get; }
 
+    int Version { get; }
+
     Task<SourceText> GetTextAsync();
     Task<VersionStamp> GetTextVersionAsync();
     Task<RazorCodeDocument> GetGeneratedOutputAsync();

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

@@ -32,6 +32,8 @@ public ImportDocumentSnapshot(IProjectSnapshot project, RazorProjectItem item)
         _version = VersionStamp.Default;
     }
 
+    public int Version => 1;
+
     public Task<RazorCodeDocument> GetGeneratedOutputAsync()
         => throw new NotSupportedException();
 

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

@@ -243,7 +243,7 @@ public ProjectState WithAddedHostDocument(HostDocument hostDocument, Func<Task<T
             return this;
         }
 
-        var documents = Documents.Add(hostDocument.FilePath, DocumentState.Create(hostDocument, loader));
+        var documents = Documents.Add(hostDocument.FilePath, DocumentState.Create(hostDocument, 1, loader));
 
         // Compute the effect on the import map
         var importTargetPaths = GetImportDocumentTargetPaths(hostDocument);

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs

@@ -34,6 +34,8 @@ internal class RemoteDocumentSnapshot(TextDocument textDocument, RemoteProjectSn
 
     public bool SupportsOutput => true;
 
+    public int Version => throw new NotImplementedException("We don't expect to use this in cohosting because we do not control generated document creation.");
+
     public Task<SourceText> GetTextAsync() => _textDocument.GetTextAsync();
 
     public Task<VersionStamp> GetTextVersionAsync() => _textDocument.GetTextVersionAsync();