Fix nullability of IDocumentSnapshot

DustinCampbell · DustinCampbell · commit b31ace04efc2 · 2024-11-07T16:47:54.000-08:00
For a long while IDocumentSnapshot's FileKind, FilePath, and TargetPath properties have all been annotated as nullable. It turns out that the only reason for this was ImportDocumentSnapshot, which has been removed. So, we can now allow these properties to be correctly annotated as non-nullable,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeDocumentReferenceHolder.cs b/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;
         }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.Comparer.cs b/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);
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.cs b/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))
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedDocumentSynchronizer.cs b/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;
         }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/OpenDocumentGenerator.Comparer.cs b/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;
         }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/OpenDocumentGenerator.cs b/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;
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractRazorComponentDefinitionService.cs b/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}");
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs b/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()
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
@@ -217,16 +217,13 @@ private static async Task<RazorCodeDocument> GenerateCodeDocumentAsync(
         var source = await GetSourceAsync(document, projectEngine, cancellationToken).ConfigureAwait(false);
 
         return forceRuntimeCodeGeneration
-            ? projectEngine.Process(source, fileKind: document.FileKind, importSources, tagHelpers)
-            : projectEngine.ProcessDesignTime(source, fileKind: document.FileKind, importSources, tagHelpers);
+            ? projectEngine.Process(source, document.FileKind, importSources, tagHelpers)
+            : projectEngine.ProcessDesignTime(source, document.FileKind, importSources, tagHelpers);
     }
 
     private static async Task<ImmutableArray<ImportItem>> GetImportItemsAsync(IDocumentSnapshot document, RazorProjectEngine projectEngine, CancellationToken cancellationToken)
     {
-        var filePath = document.FilePath.AssumeNotNull();
-        var fileKind = document.FileKind.AssumeNotNull();
-
-        var projectItem = projectEngine.FileSystem.GetItem(filePath, fileKind);
+        var projectItem = projectEngine.FileSystem.GetItem(document.FilePath, document.FileKind);
 
         using var importProjectItems = new PooledArrayBuilder<RazorProjectItem>();
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/Extensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/Extensions.cs
@@ -6,7 +6,6 @@
 #endif
 
 using System.Diagnostics;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Serialization;
 using Microsoft.AspNetCore.Razor.Utilities;
@@ -16,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 internal static class Extensions
 {
     public static DocumentSnapshotHandle ToHandle(this IDocumentSnapshot snapshot)
-        => new(snapshot.FilePath.AssumeNotNull(), snapshot.TargetPath.AssumeNotNull(), snapshot.FileKind.AssumeNotNull());
+        => new(snapshot.FilePath, snapshot.TargetPath, snapshot.FileKind);
 
     public static ProjectKey ToProjectKey(this Project project)
     {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshot.cs
@@ -11,9 +11,9 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
 internal interface IDocumentSnapshot
 {
-    string? FileKind { get; }
-    string? FilePath { get; }
-    string? TargetPath { get; }
+    string FileKind { get; }
+    string FilePath { get; }
+    string TargetPath { get; }
     IProjectSnapshot Project { get; }
 
     int Version { get; }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
@@ -104,7 +103,7 @@ public bool TryGetDocument(string filePath, [NotNullWhen(true)] out IDocumentSna
     /// </summary>
     public ImmutableArray<IDocumentSnapshot> GetRelatedDocuments(IDocumentSnapshot document)
     {
-        var targetPath = document.TargetPath.AssumeNotNull();
+        var targetPath = document.TargetPath;
 
         if (!_state.ImportsToRelatedDocuments.TryGetValue(targetPath, out var relatedDocuments))
         {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs
@@ -66,7 +66,7 @@ internal class RenameService(
             return null;
         }
 
-        var originComponentDocumentFilePath = originComponentDocumentSnapshot.FilePath.AssumeNotNull();
+        var originComponentDocumentFilePath = originComponentDocumentSnapshot.FilePath;
         var newPath = MakeNewPath(originComponentDocumentFilePath, newName);
         if (File.Exists(newPath))
         {
@@ -137,7 +137,7 @@ private static ImmutableArray<IDocumentSnapshot> GetAllDocumentSnapshots(string
     private RenameFile GetFileRenameForComponent(IDocumentSnapshot documentSnapshot, string newPath)
         => new RenameFile
         {
-            OldUri = BuildUri(documentSnapshot.FilePath.AssumeNotNull()),
+            OldUri = BuildUri(documentSnapshot.FilePath),
             NewUri = BuildUri(newPath),
         };
 
@@ -182,7 +182,7 @@ private async Task AddEditsForCodeDocumentAsync(
         }
 
         // VS Code in Windows expects path to start with '/'
-        var uri = BuildUri(documentSnapshot.FilePath.AssumeNotNull());
+        var uri = BuildUri(documentSnapshot.FilePath);
 
         AddEditsForCodeDocument(documentChanges, originTagHelpers, newName, uri, codeDocument);
     }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs
@@ -149,7 +149,7 @@ private async Task<Document> HACK_GenerateDocumentAsync(CancellationToken cancel
 
         var solution = TextDocument.Project.Solution;
         var filePathService = ProjectSnapshot.SolutionSnapshot.SnapshotManager.FilePathService;
-        var generatedFilePath = filePathService.GetRazorCSharpFilePath(Project.Key, FilePath.AssumeNotNull());
+        var generatedFilePath = filePathService.GetRazorCSharpFilePath(Project.Key, FilePath);
         var projectId = TextDocument.Project.Id;
         var generatedDocumentId = solution.GetDocumentIdsWithFilePath(generatedFilePath).First(d => d.ProjectId == projectId);
         var generatedDocument = solution.GetRequiredDocument(generatedDocumentId);
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/BackgroundDocumentGenerator.Comparer.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/BackgroundDocumentGenerator.Comparer.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
@@ -23,16 +22,16 @@ public bool Equals((IProjectSnapshot, IDocumentSnapshot) x, (IProjectSnapshot, I
             var (projectX, documentX) = x;
             var (projectY, documentY) = y;
 
-            var documentKeyX = new DocumentKey(projectX.Key, documentX.FilePath.AssumeNotNull());
-            var documentKeyY = new DocumentKey(projectY.Key, documentY.FilePath.AssumeNotNull());
+            var documentKeyX = new DocumentKey(projectX.Key, documentX.FilePath);
+            var documentKeyY = new DocumentKey(projectY.Key, documentY.FilePath);
 
             return documentKeyX.Equals(documentKeyY);
         }
 
         public int GetHashCode((IProjectSnapshot, IDocumentSnapshot) obj)
         {
             var (project, document) = obj;
-            var documentKey = new DocumentKey(project.Key, document.FilePath.AssumeNotNull());
+            var documentKey = new DocumentKey(project.Key, document.FilePath);
 
             return documentKey.GetHashCode();
         }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/BackgroundDocumentGenerator.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/BackgroundDocumentGenerator.cs
@@ -136,7 +136,7 @@ protected virtual async ValueTask ProcessBatchAsync(ImmutableArray<(IProjectSnap
 
     private bool Suppressed(IProjectSnapshot project, IDocumentSnapshot document)
     {
-        var filePath = document.FilePath.AssumeNotNull();
+        var filePath = document.FilePath;
 
         if (_projectManager.IsDocumentOpen(filePath))
         {
@@ -151,7 +151,7 @@ private bool Suppressed(IProjectSnapshot project, IDocumentSnapshot document)
 
     private void UpdateFileInfo(IProjectSnapshot project, IDocumentSnapshot document)
     {
-        var filePath = document.FilePath.AssumeNotNull();
+        var filePath = document.FilePath;
 
         if (!_suppressedDocuments.Contains(filePath))
         {
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/DefaultDynamicDocumentContainer.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/DefaultDynamicDocumentContainer.cs
@@ -19,7 +19,7 @@ internal sealed class DefaultDynamicDocumentContainer(IDocumentSnapshot document
     private RazorDocumentExcerptService? _excerptService;
     private RazorSpanMappingService? _mappingService;
 
-    public string FilePath => _documentSnapshot.FilePath.AssumeNotNull();
+    public string FilePath => _documentSnapshot.FilePath;
 
     public bool SupportsDiagnostics => false;
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/WindowsRazorProjectHostBase.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/WindowsRazorProjectHostBase.cs
@@ -9,7 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -230,10 +229,10 @@ internal Task OnProjectRenamingAsync(string oldProjectFilePath, string newProjec
                     {
                         var documentSnapshot = current.GetDocument(documentFilePath);
                         Assumes.NotNull(documentSnapshot);
-                        // TODO: The creation of the HostProject here is silly
+
                         var hostDocument = new HostDocument(
-                            documentSnapshot.FilePath.AssumeNotNull(),
-                            documentSnapshot.TargetPath.AssumeNotNull(),
+                            documentSnapshot.FilePath,
+                            documentSnapshot.TargetPath,
                             documentSnapshot.FileKind);
                         updater.DocumentAdded(projectKey, hostDocument, new FileTextLoader(hostDocument.FilePath, null));
                     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs
@@ -92,7 +92,6 @@ await testProjectManager.UpdateAsync(updater =>
     public async Task DocumentProcessed_NewWorkQueued_RestartsTimer()
     {
         // Arrange
-        Assert.NotNull(_openedDocument.FilePath);
         var codeDocument = CreateCodeDocument(s_singleRazorDiagnostic);
         var processedOpenDocument = TestDocumentSnapshot.Create(_openedDocument.FilePath, codeDocument);
 
@@ -161,10 +160,8 @@ public async Task PublishDiagnosticsAsync_NewDocumentDiagnosticsGetPublished(boo
             }
         };
 
-        Assert.NotNull(_openedDocument.FilePath);
         var codeDocument = CreateCodeDocument(shouldContainRazorDiagnostic ? s_singleRazorDiagnostic : []);
         var processedOpenDocument = TestDocumentSnapshot.Create(_openedDocument.FilePath, codeDocument);
-        Assert.NotNull(processedOpenDocument.FilePath);
 
         var clientConnectionMock = new StrictMock<IClientConnection>();
         var requestResult = new FullDocumentDiagnosticReport();
@@ -237,10 +234,8 @@ public async Task PublishDiagnosticsAsync_NewDocumentDiagnosticsGetPublished(boo
     public async Task PublishDiagnosticsAsync_NewRazorDiagnosticsGetPublished()
     {
         // Arrange
-        Assert.NotNull(_openedDocument.FilePath);
         var codeDocument = CreateCodeDocument(s_singleRazorDiagnostic);
         var processedOpenDocument = TestDocumentSnapshot.Create(_openedDocument.FilePath, codeDocument);
-        Assert.NotNull(processedOpenDocument.FilePath);
 
         var clientConnectionMock = new StrictMock<IClientConnection>();
         clientConnectionMock
@@ -295,10 +290,8 @@ public async Task PublishDiagnosticsAsync_NewRazorDiagnosticsGetPublished()
     public async Task PublishDiagnosticsAsync_NewCSharpDiagnosticsGetPublished()
     {
         // Arrange
-        Assert.NotNull(_openedDocument.FilePath);
         var codeDocument = CreateCodeDocument([]);
         var processedOpenDocument = TestDocumentSnapshot.Create(_openedDocument.FilePath, codeDocument);
-        Assert.NotNull(processedOpenDocument.FilePath);
 
         var arranging = true;
         var clientConnectionMock = new StrictMock<IClientConnection>();
@@ -368,10 +361,8 @@ public async Task PublishDiagnosticsAsync_NoopsIfRazorDiagnosticsAreSameAsPrevio
             })
             .Returns(Task.FromResult(new SumType<FullDocumentDiagnosticReport, UnchangedDocumentDiagnosticReport>?(new FullDocumentDiagnosticReport())));
 
-        Assert.NotNull(_openedDocument.FilePath);
         var codeDocument = CreateCodeDocument(s_singleRazorDiagnostic);
         var processedOpenDocument = TestDocumentSnapshot.Create(_openedDocument.FilePath, codeDocument);
-        Assert.NotNull(processedOpenDocument.FilePath);
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
         var filePathService = new LSPFilePathService(TestLanguageServerFeatureOptions.Instance);
@@ -390,10 +381,8 @@ public async Task PublishDiagnosticsAsync_NoopsIfRazorDiagnosticsAreSameAsPrevio
     public async Task PublishDiagnosticsAsync_NoopsIfCSharpDiagnosticsAreSameAsPreviousPublish()
     {
         // Arrange
-        Assert.NotNull(_openedDocument.FilePath);
         var codeDocument = CreateCodeDocument([]);
         var processedOpenDocument = TestDocumentSnapshot.Create(_openedDocument.FilePath, codeDocument);
-        Assert.NotNull(processedOpenDocument.FilePath);
 
         var clientConnectionMock = new StrictMock<IClientConnection>();
         var arranging = true;
@@ -452,7 +441,6 @@ public void ClearClosedDocuments_ClearsDiagnosticsForClosedDocument()
                 It.IsAny<CancellationToken>()))
             .Callback((string method, PublishDiagnosticParams @params, CancellationToken cancellationToken) =>
             {
-                Assert.NotNull(_closedDocument.FilePath);
                 Assert.Equal(_closedDocument.FilePath.TrimStart('/'), @params.Uri.AbsolutePath);
                 Assert.Empty(@params.Diagnostics);
             })
@@ -463,7 +451,6 @@ public void ClearClosedDocuments_ClearsDiagnosticsForClosedDocument()
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
-        Assert.NotNull(_closedDocument.FilePath);
         publisherAccessor.SetPublishedDiagnostics(_closedDocument.FilePath, s_singleRazorDiagnostic, s_singleCSharpDiagnostic);
 
         // Act
@@ -483,7 +470,6 @@ public void ClearClosedDocuments_NoopsIfDocumentIsStillOpen()
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
-        Assert.NotNull(_openedDocument.FilePath);
         publisherAccessor.SetPublishedDiagnostics(_openedDocument.FilePath, s_singleRazorDiagnostic, s_singleCSharpDiagnostic);
 
         // Act & Assert
@@ -500,7 +486,6 @@ public void ClearClosedDocuments_NoopsIfDocumentIsClosedButNoDiagnostics()
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
-        Assert.NotNull(_closedDocument.FilePath);
         publisherAccessor.SetPublishedDiagnostics(_closedDocument.FilePath, razorDiagnostics: [], csharpDiagnostics: []);
 
         // Act & Assert
@@ -517,8 +502,6 @@ public void ClearClosedDocuments_RestartsTimerIfDocumentsStillOpen()
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
-        Assert.NotNull(_closedDocument.FilePath);
-        Assert.NotNull(_openedDocument.FilePath);
         publisherAccessor.SetPublishedDiagnostics(_closedDocument.FilePath, razorDiagnostics: [], csharpDiagnostics: []);
         publisherAccessor.SetPublishedDiagnostics(_openedDocument.FilePath, razorDiagnostics: [], csharpDiagnostics: []);
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestDocumentSnapshot.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestDocumentSnapshot.cs
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/RazorDynamicFileInfoProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/RazorDynamicFileInfoProviderTest.cs

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void DocumentProcessed(RazorCodeDocument codeDocument, IDocumentSnapshot`
`30`	`30`	`// multiple parses/regenerations across LSP requests that are all for the same document version.`
`31`	`31`	`lock (_codeDocumentCache)`
`32`	`32`	`{`
`33`		`- var key = new DocumentKey(documentSnapshot.Project.Key, documentSnapshot.FilePath.AssumeNotNull());`
	`33`	`+ var key = new DocumentKey(documentSnapshot.Project.Key, documentSnapshot.FilePath);`
`34`	`34`	`_codeDocumentCache[key] = codeDocument;`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@ public bool Equals(IDocumentSnapshot? x, IDocumentSnapshot? y)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public int GetHashCode(IDocumentSnapshot obj)`
`29`		`- {`
`30`		`- var filePath = obj.FilePath.AssumeNotNull();`
`31`		`- return FilePathComparer.Instance.GetHashCode(filePath);`
`32`		`- }`
	`29`	`+ => FilePathComparer.Instance.GetHashCode(obj.FilePath);`
`33`	`30`	`}`
`34`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private async Task PublishDiagnosticsAsync(IDocumentSnapshot document, Cancellat`
`121`	`121`
`122`	`122`	`lock (_publishedDiagnostics)`
`123`	`123`	`{`
`124`		`- var filePath = document.FilePath.AssumeNotNull();`
	`124`	`+ var filePath = document.FilePath;`
`125`	`125`
`126`	`126`	`// See if these are the same diagnostics as last time. If so, we don't need to publish.`
`127`	`127`	`if (_publishedDiagnostics.TryGetValue(filePath, out var previousDiagnostics))`
Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,18 @@ internal class GeneratedDocumentSynchronizer(`
`19`	`19`	`public void DocumentProcessed(RazorCodeDocument codeDocument, IDocumentSnapshot document)`
`20`	`20`	`{`
`21`	`21`	`var hostDocumentVersion = document.Version;`
`22`		`- var filePath = document.FilePath.AssumeNotNull();`
	`22`	`+ var filePath = document.FilePath;`
`23`	`23`
`24`	`24`	`// If the document isn't open, and we're not updating buffers for closed documents, then we don't need to do anything.`
`25`		`- if (!_projectManager.IsDocumentOpen(document.FilePath) &&`
	`25`	`+ if (!_projectManager.IsDocumentOpen(filePath) &&`
`26`	`26`	`!_languageServerFeatureOptions.UpdateBuffersForClosedDocuments)`
`27`	`27`	`{`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// If the document has been removed from the project, then don't do anything, or version numbers will be thrown off`
`32`	`32`	`if (!_projectManager.TryGetLoadedProject(document.Project.Key, out var project) \|\|`
`33`		`- !project.ContainsDocument(document.FilePath))`
	`33`	`+ !project.ContainsDocument(filePath))`
`34`	`34`	`{`
`35`	`35`	`return;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public int GetHashCode(IDocumentSnapshot obj)`
`37`	`37`	`{`
`38`	`38`	`var hash = HashCodeCombiner.Start();`
`39`	`39`	`hash.Add(obj.Project.Key.Id, FilePathComparer.Instance);`
`40`		`- hash.Add(obj.FileKind.AssumeNotNull(), FilePathComparer.Instance);`
	`40`	`+ hash.Add(obj.FileKind, FilePathComparer.Instance);`
`41`	`41`	`return hash.CombinedHash;`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private void ProjectManager_Changed(object? sender, ProjectChangeEventArgs args)`
`148`	`148`	`{`
`149`	`149`	`foreach (var relatedDocument in oldProject.GetRelatedDocuments(document))`
`150`	`150`	`{`
`151`		`- var relatedDocumentFilePath = relatedDocument.FilePath.AssumeNotNull();`
	`151`	`+ var relatedDocumentFilePath = relatedDocument.FilePath;`
`152`	`152`
`153`	`153`	`if (newProject.TryGetDocument(relatedDocumentFilePath, out var newRelatedDocument))`
`154`	`154`	`{`
`@@ -169,7 +169,7 @@ private void ProjectManager_Changed(object? sender, ProjectChangeEventArgs args)`
`169`	`169`
`170`	`170`	`void EnqueueIfNecessary(IDocumentSnapshot document)`
`171`	`171`	`{`
`172`		`- if (!_projectManager.IsDocumentOpen(document.FilePath.AssumeNotNull()) &&`
	`172`	`+ if (!_projectManager.IsDocumentOpen(document.FilePath) &&`
`173`	`173`	`!_options.UpdateBuffersForClosedDocuments)`
`174`	`174`	`{`
`175`	`175`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`#endif`
`7`	`7`
`8`	`8`	`using System.Diagnostics;`
`9`		`-using Microsoft.AspNetCore.Razor;`
`10`	`9`	`using Microsoft.AspNetCore.Razor.ProjectSystem;`
`11`	`10`	`using Microsoft.AspNetCore.Razor.Serialization;`
`12`	`11`	`using Microsoft.AspNetCore.Razor.Utilities;`
`@@ -16,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;`
`16`	`15`	`internal static class Extensions`
`17`	`16`	`{`
`18`	`17`	`public static DocumentSnapshotHandle ToHandle(this IDocumentSnapshot snapshot)`
`19`		`- => new(snapshot.FilePath.AssumeNotNull(), snapshot.TargetPath.AssumeNotNull(), snapshot.FileKind.AssumeNotNull());`
	`18`	`+ => new(snapshot.FilePath, snapshot.TargetPath, snapshot.FileKind);`
`20`	`19`
`21`	`20`	`public static ProjectKey ToProjectKey(this Project project)`
`22`	`21`	`{`