Port cold start fixes to 17.9 P1 (#9529)

* Whitespace

Just a couple of error list issues

* Null enable project snapshot manager

* Prevent a missing project from bringing down the language server

* Don't use the fallback manager if we know about real info now

* Allow documents to be found in the misc files project

This is a regression from pre-multi-targeting. I incorrectly assumed that if we got project context info, it must mean the project was known, but that isn't true at start up necessarily.

* Use a null namespace, don't hardcode the default

This felt wrong, but I doubt it meaningfully changes things.

* Rename action class to match the rest

(and fix typo)

* Thank you Visual Studio for not telling me about these possible null references, I was not mentally prepared to handle them.

Author: davidwengier

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

@@ -6,6 +6,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
+using Microsoft.AspNetCore.Razor.Utilities;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
@@ -100,12 +101,24 @@ private bool TryResolveDocument(string filePath, VSProjectContext? projectContex
         }
 
         var project = _projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectContext.ToProjectKey());
-        if (project.GetDocument(filePath) is { } document)
+        if (project?.GetDocument(filePath) is { } document)
         {
             documentSnapshot = document;
             return true;
         }
 
+        // Couldn't find the document in a real project. Maybe the language server doesn't yet know about the project
+        // that the IDE is asking us about. In that case, we might have the document in our misc files project, and we'll
+        // move it to the real project when/if we find out about it.
+        var miscellaneousProject = _snapshotResolver.GetMiscellaneousProject();
+        var normalizedDocumentPath = FilePathNormalizer.Normalize(filePath);
+        if (miscellaneousProject.GetDocument(normalizedDocumentPath) is { } miscDocument)
+        {
+            _logger.LogDebug("Found document {document} in the misc files project, but was asked for project context {context}", filePath, projectContext);
+            documentSnapshot = miscDocument;
+            return true;
+        }
+
         documentSnapshot = null;
         return false;
     }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPassBase.cs

@@ -526,6 +526,7 @@ bool IsSingleLineExplicitExpression()
             {
                 return true;
             }
+
             return owner.AncestorsAndSelf().Any(n => n is CSharpImplicitExpressionSyntax);
         }
 

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

@@ -164,7 +164,7 @@ private void ProjectSnapshotManager_Changed(object? sender, ProjectChangeEventAr
 
                 void TryEnqueue(IDocumentSnapshot document)
                 {
-                    if (!ProjectManager.IsDocumentOpen(document.FilePath) && !_languageServerFeatureOptions.UpdateBuffersForClosedDocuments)
+                    if (!ProjectManager.IsDocumentOpen(document.FilePath.AssumeNotNull()) && !_languageServerFeatureOptions.UpdateBuffersForClosedDocuments)
                     {
                         return;
                     }

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

@@ -270,7 +270,7 @@ public override void UpdateProject(
     {
         _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
-        var project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectKey);
+        var project = (ProjectSnapshot?)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectKey);
 
         if (project is null)
         {
@@ -323,7 +323,7 @@ private void UpdateProjectDocuments(ImmutableArray<DocumentSnapshotHandle> docum
     {
         _logger.LogDebug("UpdateProjectDocuments for {projectKey} with {documentCount} documents.", projectKey, documents.Length);
 
-        var project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectKey);
+        var project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectKey).AssumeNotNull();
         var currentHostProject = project.HostProject;
         var projectDirectory = FilePathNormalizer.GetNormalizedDirectoryName(project.FilePath);
         var documentMap = documents.ToDictionary(document => EnsureFullPath(document.FilePath, projectDirectory), FilePathComparer.Instance);
@@ -343,7 +343,7 @@ private void UpdateProjectDocuments(ImmutableArray<DocumentSnapshotHandle> docum
             MoveDocument(documentFilePath, project, miscellaneousProject);
         }
 
-        project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectKey);
+        project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(projectKey).AssumeNotNull();
 
         // Update existing documents
         foreach (var documentFilePath in project.DocumentFilePaths)
@@ -379,7 +379,7 @@ private void UpdateProjectDocuments(ImmutableArray<DocumentSnapshotHandle> docum
             _projectSnapshotManagerAccessor.Instance.DocumentAdded(currentHostProject.Key, newHostDocument, remoteTextLoader);
         }
 
-        project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(project.Key);
+        project = (ProjectSnapshot)_projectSnapshotManagerAccessor.Instance.GetLoadedProject(project.Key).AssumeNotNull();
         miscellaneousProject = (ProjectSnapshot)_snapshotResolver.GetMiscellaneousProject();
 
         // Add (or migrate from misc) any new documents

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

@@ -64,7 +64,7 @@ public IProjectSnapshot GetMiscellaneousProject()
         if (miscellaneousProject is null)
         {
             _projectSnapshotManagerAccessor.Instance.ProjectAdded(MiscellaneousHostProject);
-            miscellaneousProject = _projectSnapshotManagerAccessor.Instance.GetLoadedProject(MiscellaneousHostProject.Key);
+            miscellaneousProject = _projectSnapshotManagerAccessor.Instance.GetLoadedProject(MiscellaneousHostProject.Key).AssumeNotNull();
         }
 
         return miscellaneousProject;

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

@@ -57,7 +57,7 @@ public DefaultProjectSnapshotManager(
                 }
             }
 
-            foreach (var trigger in triggers) 
+            foreach (var trigger in triggers)
             {
                 if (trigger is not IPriorityProjectSnapshotChangeTrigger)
                 {
@@ -310,7 +310,7 @@ internal override void ProjectWorkspaceStateChanged(ProjectKey projectKey, Proje
         if (TryChangeEntry_UsesLock(
             projectKey,
             documentFilePath: null,
-            new ProjectWorkspaceStateChanged(projectWorkspaceState),
+            new ProjectWorkspaceStateChangedAction(projectWorkspaceState),
             out var oldSnapshot,
             out var newSnapshot))
         {
@@ -590,8 +590,8 @@ private bool TryChangeEntry_UsesLock(
             case ProjectRemovedAction:
                 return null;
 
-            case ProjectWorkspaceStateChanged worskapceStateChangedAction:
-                return new Entry(originalEntry.State.WithProjectWorkspaceState(worskapceStateChangedAction.WorkspaceState));
+            case ProjectWorkspaceStateChangedAction workspaceStateChangedAction:
+                return new Entry(originalEntry.State.WithProjectWorkspaceState(workspaceStateChangedAction.WorkspaceState));
 
             case HostProjectUpdatedAction hostProjectUpdatedAction:
                 return new Entry(originalEntry.State.WithHostProject(hostProjectUpdatedAction.HostProject));

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

@@ -7,7 +7,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
 internal class FallbackHostProject : HostProject
 {
-    public FallbackHostProject(string projectFilePath, string intermediateOutputPath, RazorConfiguration razorConfiguration, string rootNamespace, string displayName)
+    public FallbackHostProject(string projectFilePath, string intermediateOutputPath, RazorConfiguration razorConfiguration, string? rootNamespace, string displayName)
         : base(projectFilePath, intermediateOutputPath, razorConfiguration, rootNamespace, displayName)
     {
     }

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

@@ -37,13 +37,19 @@ public FallbackProjectManager(
 
     internal void DynamicFileAdded(ProjectId projectId, ProjectKey razorProjectKey, string projectFilePath, string filePath)
     {
+        var project = _projectSnapshotManagerAccessor.Instance.GetLoadedProject(razorProjectKey);
         if (_fallbackProjectIds.Contains(projectId))
         {
-            // If this is a fallback project, then Roslyn may not track documents in the project, so these dynamic file notifications
-            // are the only way to know about files in the project.
-            AddFallbackDocument(razorProjectKey, filePath, projectFilePath);
+            // The project might have started as a fallback project, but it might have been upgraded by our getting CPS info
+            // about it. In that case, leave the CPS bits to do the work
+            if (project is ProjectSnapshot { HostProject: FallbackHostProject })
+            {
+                // If this is a fallback project, then Roslyn may not track documents in the project, so these dynamic file notifications
+                // are the only way to know about files in the project.
+                AddFallbackDocument(razorProjectKey, filePath, projectFilePath);
+            }
         }
-        else if (_projectSnapshotManagerAccessor.Instance.GetLoadedProject(razorProjectKey) is null)
+        else if (project is null)
         {
             // We have been asked to provide dynamic file info, which means there is a .razor or .cshtml file in the project
             // but for some reason our project system doesn't know about the project. In these cases (often when people don't
@@ -81,7 +87,7 @@ private void AddFallbackProject(ProjectId projectId, string filePath)
             return;
         }
 
-        var rootNamespace = project.DefaultNamespace ?? "ASP";
+        var rootNamespace = project.DefaultNamespace;
 
         // We create this as a fallback project so that other parts of the system can reason about them - eg we don't do code
         // generation for closed files for documents in these projects. If these projects become "real", either because capabilities

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

@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-#nullable disable
-
 using System;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.Host;
@@ -17,7 +15,7 @@ internal abstract class ProjectSnapshotManager : ILanguageService
 
     public abstract bool IsDocumentOpen(string documentFilePath);
 
-    public abstract IProjectSnapshot GetLoadedProject(ProjectKey projectKey);
+    public abstract IProjectSnapshot? GetLoadedProject(ProjectKey projectKey);
 
     public abstract ImmutableArray<ProjectKey> GetAllProjectKeys(string projectFileName);
 }

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

@@ -33,4 +33,4 @@ internal record ProjectRemovedAction(ProjectKey ProjectKey) : IUpdateProjectActi
 
 internal record HostProjectUpdatedAction(HostProject HostProject) : IUpdateProjectAction;
 
-internal record ProjectWorkspaceStateChanged(ProjectWorkspaceState WorkspaceState) : IUpdateProjectAction;
+internal record ProjectWorkspaceStateChangedAction(ProjectWorkspaceState WorkspaceState) : IUpdateProjectAction;