PR Feedback

Author: davidwengier

src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/CohostStartupService.cs

@@ -17,7 +17,7 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
 [Export(typeof(ICohostStartupService))]
 [method: ImportingConstructor]
-internal class CohostStartupService(
+internal sealed class CohostStartupService(
     [ImportMany] IEnumerable<Lazy<IRazorCohostStartupService>> lazyStartupServices,
     ILoggerFactory loggerFactory) : ICohostStartupService
 {
@@ -32,11 +32,17 @@ public async Task StartupAsync(string clientCapabilitiesString, RazorCohostReque
 
         foreach (var provider in providers)
         {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                _logger.LogInformation($"Razor extension startup cancelled.");
+                return;
+            }
+
             try
             {
                 await provider.StartupAsync(clientCapabilities, requestContext, cancellationToken).ConfigureAwait(false);
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ex is not OperationCanceledException)
             {
                 _logger.LogError(ex, $"Error initializing Razor startup service '{provider.GetType().Name}'");
             }

src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Diagnostics/CohostDocumentPullDiagnosticsEndpointBase.cs

@@ -41,12 +41,12 @@ internal abstract class CohostDocumentPullDiagnosticsEndpointBase<TRequest, TRes
 
     protected virtual LspDiagnostic[] ExtractHtmlDiagnostics(TResponse result)
     {
-        throw new NotImplementedException("If SupportsHtmlDiagnostics is true, you must implement GetHtmlDiagnostics");
+        throw new NotSupportedException("If SupportsHtmlDiagnostics is true, you must implement GetHtmlDiagnostics");
     }
 
     protected virtual TRequest CreateHtmlParams(Uri uri)
     {
-        throw new NotImplementedException("If SupportsHtmlDiagnostics is true, you must implement CreateHtmlParams");
+        throw new NotSupportedException("If SupportsHtmlDiagnostics is true, you must implement CreateHtmlParams");
     }
 
     protected async Task<LspDiagnostic[]?> GetDiagnosticsAsync(TextDocument razorDocument, CancellationToken cancellationToken)
@@ -75,6 +75,11 @@ protected virtual TRequest CreateHtmlParams(Uri uri)
             throw;
         }
 
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return null;
+        }
+
         var csharpDiagnostics = csharpTask.VerifyCompleted();
         var htmlDiagnostics = htmlTask.VerifyCompleted();
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/RazorCohostDynamicRegistrationService.cs

@@ -77,6 +77,5 @@ await razorCohostClientLanguageServerManager.SendRequestAsync(
                 Registrations = allRegistrations
             },
             cancellationToken).ConfigureAwait(false);
-
     }
 }