Use caches with proper lifetimes, to replace the existing static caches

Author: davidwengier

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RemoteCompletionService.cs

@@ -36,6 +36,7 @@ protected override IRemoteCompletionService CreateService(in ServiceArgs args)
 
     private readonly RazorCompletionListProvider _razorCompletionListProvider = args.ExportProvider.GetExportedValue<RazorCompletionListProvider>();
     private readonly CompletionListCache _completionListCache = args.ExportProvider.GetExportedValue<CompletionListCache>();
+    private readonly RoslynCompletionListCacheWrapper _roslynCompletionListCacheWrapper = args.ExportProvider.GetExportedValue<RoslynCompletionListCacheWrapper>();
     private readonly IClientCapabilitiesService _clientCapabilitiesService = args.ExportProvider.GetExportedValue<IClientCapabilitiesService>();
     private readonly CompletionTriggerAndCommitCharacters _triggerAndCommitCharacters = args.ExportProvider.GetExportedValue<CompletionTriggerAndCommitCharacters>();
     private readonly IRazorFormattingService _formattingService = args.ExportProvider.GetExportedValue<IRazorFormattingService>();
@@ -204,16 +205,15 @@ private async ValueTask<Response> GetCompletionAsync(
         VSInternalCompletionList? completionList = null;
         using (_telemetryReporter.TrackLspRequest(Methods.TextDocumentCompletionName, Constants.ExternalAccessServerName, TelemetryThresholds.CompletionSubLSPTelemetryThreshold, correlationId))
         {
-#pragma warning disable CS0618 // Type or member is obsolete. Will be addressed in a future PR but Roslyn changes are batched
             completionList = await ExternalAccess.Razor.Cohost.Handlers.Completion.GetCompletionListAsync(
                 generatedDocument,
                 mappedLinePosition,
                 completionContext,
                 clientCapabilities.SupportsVisualStudioExtensions,
                 completionSetting,
+                _roslynCompletionListCacheWrapper.GetCache(),
                 cancellationToken)
                 .ConfigureAwait(false);
-#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         if (completionList is null)
@@ -330,14 +330,13 @@ private async ValueTask<VSInternalCompletionItem> ResolveCSharpCompletionItemAsy
 
             var clientCapabilities = _clientCapabilitiesService.ClientCapabilities;
             var completionListSetting = clientCapabilities.TextDocument?.Completion;
-#pragma warning disable CS0618 // Type or member is obsolete. Will be addressed in a future PR but Roslyn changes are batched
             var result = await ExternalAccess.Razor.Cohost.Handlers.Completion.ResolveCompletionItemAsync(
                 request,
                 generatedDocument,
                 clientCapabilities.SupportsVisualStudioExtensions,
                 completionListSetting ?? new(),
+                _roslynCompletionListCacheWrapper.GetCache(),
                 cancellationToken).ConfigureAwait(false);
-#pragma warning restore CS0618 // Type or member is obsolete
 
             var item = JsonHelpers.Convert<CompletionItem, VSInternalCompletionItem>(result).AssumeNotNull();
 

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RoslynCompletionListCacheWrapper.cs

@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
+using Microsoft.CodeAnalysis.Razor.Remote;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor;
+
+[Shared]
+[Export(typeof(ILspLifetimeService))]
+[Export(typeof(RoslynCompletionListCacheWrapper))]
+internal class RoslynCompletionListCacheWrapper : ILspLifetimeService
+{
+    private CompletionListCacheWrapper? _cacheWrapper;
+
+    public CompletionListCacheWrapper GetCache()
+    {
+        _cacheWrapper ??= new();
+        return _cacheWrapper;
+    }
+
+    void ILspLifetimeService.OnLspInitialized(RemoteClientLSPInitializationOptions options)
+    {
+    }
+
+    void ILspLifetimeService.OnLspUninitialized()
+    {
+        _cacheWrapper = null;
+    }
+}

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlayHints/RemoteInlayHintService.cs

@@ -26,6 +26,8 @@ protected override IRemoteInlayHintService CreateService(in ServiceArgs args)
             => new RemoteInlayHintService(in args);
     }
 
+    private readonly RoslynInlayHintCacheWrapper _cacheWrapper = args.ExportProvider.GetExportedValue<RoslynInlayHintCacheWrapper>();
+
     public ValueTask<InlayHint[]?> GetInlayHintsAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, InlayHintParams inlayHintParams, bool displayAllOverride, CancellationToken cancellationToken)
         => RunServiceAsync(
             solutionInfo,
@@ -67,9 +69,7 @@ protected override IRemoteInlayHintService CreateService(in ServiceArgs args)
         var textDocument = inlayHintParams.TextDocument.WithUri(generatedDocument.CreateUri());
         var range = projectedLinePositionSpan.ToRange();
 
-#pragma warning disable CS0618 // Type or member is obsolete. Will be addressed in a future PR but Roslyn changes are batched
-        var hints = await InlayHints.GetInlayHintsAsync(generatedDocument, textDocument, range, displayAllOverride, cancellationToken).ConfigureAwait(false);
-#pragma warning restore CS0618 // Type or member is obsolete
+        var hints = await InlayHints.GetInlayHintsAsync(generatedDocument, textDocument, range, displayAllOverride, _cacheWrapper.GetCache(), cancellationToken).ConfigureAwait(false);
         if (hints is null)
         {
             return null;
@@ -131,8 +131,6 @@ private async ValueTask<InlayHint> ResolveInlayHintAsync(RemoteDocumentContext c
             .GetGeneratedDocumentAsync(cancellationToken)
             .ConfigureAwait(false);
 
-#pragma warning disable CS0618 // Type or member is obsolete. Will be addressed in a future PR but Roslyn changes are batched
-        return await InlayHints.ResolveInlayHintAsync(generatedDocument, inlayHint, cancellationToken).ConfigureAwait(false);
-#pragma warning restore CS0618 // Type or member is obsolete
+        return await InlayHints.ResolveInlayHintAsync(generatedDocument, inlayHint, _cacheWrapper.GetCache(), cancellationToken).ConfigureAwait(false);
     }
 }

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlayHints/RoslynInlayHintCacheWrapper.cs

@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
+using Microsoft.CodeAnalysis.Razor.Remote;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor;
+
+[Shared]
+[Export(typeof(ILspLifetimeService))]
+[Export(typeof(RoslynInlayHintCacheWrapper))]
+internal class RoslynInlayHintCacheWrapper : ILspLifetimeService
+{
+    private InlayHintCacheWrapper? _inlayHintCacheWrapper;
+
+    public InlayHintCacheWrapper GetCache()
+    {
+        _inlayHintCacheWrapper ??= new();
+        return _inlayHintCacheWrapper;
+    }
+
+    void ILspLifetimeService.OnLspInitialized(RemoteClientLSPInitializationOptions options)
+    {
+    }
+
+    void ILspLifetimeService.OnLspUninitialized()
+    {
+        _inlayHintCacheWrapper = null;
+    }
+}