Remove ImportDocumentSnapshot and (finally) fix nullability annotations on IDocumentSnapshot (#11184)

Commit-by-commit is the way. 😄

Author: DustinCampbell

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeDocumentReferenceHolder.cs

@@ -30,7 +30,7 @@ public void DocumentProcessed(RazorCodeDocument codeDocument, IDocumentSnapshot
         // multiple parses/regenerations across LSP requests that are all for the same document version.
         lock (_codeDocumentCache)
         {
-            var key = new DocumentKey(documentSnapshot.Project.Key, documentSnapshot.FilePath.AssumeNotNull());
+            var key = new DocumentKey(documentSnapshot.Project.Key, documentSnapshot.FilePath);
             _codeDocumentCache[key] = codeDocument;
         }
     }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.Comparer.cs

@@ -26,9 +26,6 @@ public bool Equals(IDocumentSnapshot? x, IDocumentSnapshot? y)
         }
 
         public int GetHashCode(IDocumentSnapshot obj)
-        {
-            var filePath = obj.FilePath.AssumeNotNull();
-            return FilePathComparer.Instance.GetHashCode(filePath);
-        }
+            => FilePathComparer.Instance.GetHashCode(obj.FilePath);
     }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.cs

@@ -121,7 +121,7 @@ private async Task PublishDiagnosticsAsync(IDocumentSnapshot document, Cancellat
 
         lock (_publishedDiagnostics)
         {
-            var filePath = document.FilePath.AssumeNotNull();
+            var filePath = document.FilePath;
 
             // See if these are the same diagnostics as last time. If so, we don't need to publish.
             if (_publishedDiagnostics.TryGetValue(filePath, out var previousDiagnostics))

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedDocumentSynchronizer.cs

@@ -19,18 +19,18 @@ internal class GeneratedDocumentSynchronizer(
     public void DocumentProcessed(RazorCodeDocument codeDocument, IDocumentSnapshot document)
     {
         var hostDocumentVersion = document.Version;
-        var filePath = document.FilePath.AssumeNotNull();
+        var filePath = document.FilePath;
 
         // If the document isn't open, and we're not updating buffers for closed documents, then we don't need to do anything.
-        if (!_projectManager.IsDocumentOpen(document.FilePath) &&
+        if (!_projectManager.IsDocumentOpen(filePath) &&
             !_languageServerFeatureOptions.UpdateBuffersForClosedDocuments)
         {
             return;
         }
 
         // If the document has been removed from the project, then don't do anything, or version numbers will be thrown off
         if (!_projectManager.TryGetLoadedProject(document.Project.Key, out var project) ||
-            !project.ContainsDocument(document.FilePath))
+            !project.ContainsDocument(filePath))
         {
             return;
         }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/OpenDocumentGenerator.Comparer.cs

@@ -37,7 +37,7 @@ public int GetHashCode(IDocumentSnapshot obj)
         {
             var hash = HashCodeCombiner.Start();
             hash.Add(obj.Project.Key.Id, FilePathComparer.Instance);
-            hash.Add(obj.FileKind.AssumeNotNull(), FilePathComparer.Instance);
+            hash.Add(obj.FileKind, FilePathComparer.Instance);
             return hash.CombinedHash;
         }
     }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/OpenDocumentGenerator.cs

@@ -148,7 +148,7 @@ private void ProjectManager_Changed(object? sender, ProjectChangeEventArgs args)
                     {
                         foreach (var relatedDocument in oldProject.GetRelatedDocuments(document))
                         {
-                            var relatedDocumentFilePath = relatedDocument.FilePath.AssumeNotNull();
+                            var relatedDocumentFilePath = relatedDocument.FilePath;
 
                             if (newProject.TryGetDocument(relatedDocumentFilePath, out var newRelatedDocument))
                             {
@@ -169,7 +169,7 @@ private void ProjectManager_Changed(object? sender, ProjectChangeEventArgs args)
 
         void EnqueueIfNecessary(IDocumentSnapshot document)
         {
-            if (!_projectManager.IsDocumentOpen(document.FilePath.AssumeNotNull()) &&
+            if (!_projectManager.IsDocumentOpen(document.FilePath) &&
                 !_options.UpdateBuffersForClosedDocuments)
             {
                 return;

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractRazorComponentDefinitionService.cs

@@ -3,7 +3,6 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -62,7 +61,7 @@ internal abstract class AbstractRazorComponentDefinitionService(
             return null;
         }
 
-        var componentFilePath = componentDocument.FilePath.AssumeNotNull();
+        var componentFilePath = componentDocument.FilePath;
 
         _logger.LogInformation($"Definition found at file path: {componentFilePath}");
 

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

@@ -23,8 +23,8 @@ internal class DocumentContext(Uri uri, IDocumentSnapshot snapshot, VSProjectCon
 
     public Uri Uri { get; } = uri;
     public IDocumentSnapshot Snapshot { get; } = snapshot;
-    public string FilePath => Snapshot.FilePath.AssumeNotNull();
-    public string FileKind => Snapshot.FileKind.AssumeNotNull();
+    public string FilePath => Snapshot.FilePath;
+    public string FileKind => Snapshot.FileKind;
     public IProjectSnapshot Project => Snapshot.Project;
 
     public TextDocumentIdentifier GetTextDocumentIdentifier()

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

@@ -82,15 +82,8 @@ public async ValueTask<RazorCodeDocument> GetGeneratedOutputAsync(bool forceDesi
         return output;
     }
 
-    private async Task<RazorCodeDocument> GetDesignTimeGeneratedOutputAsync(CancellationToken cancellationToken)
-    {
-        var tagHelpers = await Project.GetTagHelpersAsync(cancellationToken).ConfigureAwait(false);
-        var projectEngine = Project.GetProjectEngine();
-        var imports = await DocumentState.GetImportsAsync(this, projectEngine, cancellationToken).ConfigureAwait(false);
-        return await DocumentState
-            .GenerateCodeDocumentAsync(this, projectEngine, imports, tagHelpers, forceRuntimeCodeGeneration: false, cancellationToken)
-            .ConfigureAwait(false);
-    }
+    private Task<RazorCodeDocument> GetDesignTimeGeneratedOutputAsync(CancellationToken cancellationToken)
+        => DocumentState.GenerateCodeDocumentAsync(this, Project.GetProjectEngine(), forceRuntimeCodeGeneration: false, cancellationToken);
 
     /// <summary>
     ///  Retrieves a cached Roslyn <see cref="SyntaxTree"/> from the generated C# document.

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

@@ -186,7 +186,7 @@ static void PropagateToTaskCompletionSource(
             var configurationVersion = project.ConfigurationVersion;
             var projectWorkspaceStateVersion = project.ProjectWorkspaceStateVersion;
             var documentCollectionVersion = project.DocumentCollectionVersion;
-            var imports = await GetImportsAsync(document, project.GetProjectEngine(), cancellationToken).ConfigureAwait(false);
+            var importItems = await GetImportItemsAsync(document, project.GetProjectEngine(), cancellationToken).ConfigureAwait(false);
             var documentVersion = await document.GetTextVersionAsync(cancellationToken).ConfigureAwait(false);
 
             // OK now that have the previous output and all of the versions, we can see if anything
@@ -207,7 +207,7 @@ static void PropagateToTaskCompletionSource(
                 inputVersion = documentCollectionVersion;
             }
 
-            foreach (var import in imports)
+            foreach (var import in importItems)
             {
                 var importVersion = import.Version;
                 if (inputVersion.GetNewerVersion(importVersion) == importVersion)
@@ -232,9 +232,8 @@ static void PropagateToTaskCompletionSource(
                 }
             }
 
-            var tagHelpers = await project.GetTagHelpersAsync(cancellationToken).ConfigureAwait(false);
             var forceRuntimeCodeGeneration = project.LanguageServerFeatureOptions.ForceRuntimeCodeGeneration;
-            var codeDocument = await GenerateCodeDocumentAsync(document, project.GetProjectEngine(), imports, tagHelpers, forceRuntimeCodeGeneration, cancellationToken).ConfigureAwait(false);
+            var codeDocument = await GenerateCodeDocumentAsync(document, project.GetProjectEngine(), importItems, forceRuntimeCodeGeneration, cancellationToken).ConfigureAwait(false);
             return (codeDocument, inputVersion);
         }