Cohosting OnAutoInsert endpoint

eng/targets/Services.props

@@ -27,5 +27,6 @@
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.InlayHint" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteInlayHintService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.GoToDefinition" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteGoToDefinitionService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.Rename" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteRenameService+Factory" />
+    <ServiceHubService Include="Microsoft.VisualStudio.Razor.AutoInsert" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteAutoInsertService+Factory" />
   </ItemGroup>
 </Project>

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/OnAutoInsertEndpoint.cs

@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Threading;
+using Microsoft.CodeAnalysis.Razor.AutoInsert;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -26,21 +27,18 @@ internal class OnAutoInsertEndpoint(
     LanguageServerFeatureOptions languageServerFeatureOptions,
     IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
-    IEnumerable<IOnAutoInsertProvider> onAutoInsertProvider,
+    IAutoInsertService autoInsertService,
     RazorLSPOptionsMonitor optionsMonitor,
     IAdhocWorkspaceFactory workspaceFactory,
     IRazorFormattingService razorFormattingService,
     ILoggerFactory loggerFactory)
     : AbstractRazorDelegatingEndpoint<VSInternalDocumentOnAutoInsertParams, VSInternalDocumentOnAutoInsertResponseItem?>(languageServerFeatureOptions, documentMappingService, clientConnection, loggerFactory.GetOrCreateLogger<OnAutoInsertEndpoint>()), ICapabilitiesProvider
 {
-    private static readonly HashSet<string> s_htmlAllowedTriggerCharacters = new(StringComparer.Ordinal) { "=", };
-    private static readonly HashSet<string> s_cSharpAllowedTriggerCharacters = new(StringComparer.Ordinal) { "'", "/", "\n" };
-
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
     private readonly RazorLSPOptionsMonitor _optionsMonitor = optionsMonitor;
     private readonly IAdhocWorkspaceFactory _workspaceFactory = workspaceFactory;
     private readonly IRazorFormattingService _razorFormattingService = razorFormattingService;
-    private readonly List<IOnAutoInsertProvider> _onAutoInsertProviders = onAutoInsertProvider.ToList();
+    private readonly IAutoInsertService _autoInsertService = autoInsertService;
 
     protected override string CustomMessageTarget => CustomMessageNames.RazorOnAutoInsertEndpointName;
 
@@ -53,17 +51,16 @@ internal class OnAutoInsertEndpoint(
 
     public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, VSInternalClientCapabilities clientCapabilities)
     {
-        var triggerCharacters = _onAutoInsertProviders.Select(provider => provider.TriggerCharacter);
+        var triggerCharacters = _autoInsertService.TriggerCharacters;
 
         if (_languageServerFeatureOptions.SingleServerSupport)
         {
-            triggerCharacters = triggerCharacters.Concat(s_htmlAllowedTriggerCharacters).Concat(s_cSharpAllowedTriggerCharacters);
+            triggerCharacters = triggerCharacters
+                .Concat(AutoInsertService.HtmlAllowedAutoInsertTriggerCharacters)
+                .Concat(AutoInsertService.CSharpAllowedAutoInsertTriggerCharacters);
         }
 
-        serverCapabilities.OnAutoInsertProvider = new VSInternalDocumentOnAutoInsertOptions()
-        {
-            TriggerCharacters = triggerCharacters.Distinct().ToArray()
-        };
+        serverCapabilities.EnableOnAutoInsert(triggerCharacters);
     }
 
     protected override async Task<VSInternalDocumentOnAutoInsertResponseItem?> TryHandleAsync(VSInternalDocumentOnAutoInsertParams request, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
@@ -84,36 +81,20 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
 
         var character = request.Character;
 
-        using var applicableProviders = new PooledArrayBuilder<IOnAutoInsertProvider>();
-        foreach (var provider in _onAutoInsertProviders)
-        {
-            if (provider.TriggerCharacter == character)
-            {
-                applicableProviders.Add(provider);
-            }
-        }
-
-        if (applicableProviders.Count == 0)
-        {
-            // There's currently a bug in the LSP platform where other language clients OnAutoInsert trigger characters influence every language clients trigger characters.
-            // To combat this we need to preemptively return so we don't try having our providers handle characters that they can't.
-            return null;
-        }
+        var insertTextEdit = _autoInsertService.TryResolveInsertion(
+            codeDocument,
+            request.Position,
+            character,
+            _optionsMonitor.CurrentValue.AutoClosingTags
+        );
 
-        var uri = request.TextDocument.Uri;
-        var position = request.Position;
-
-        using var formattingContext = FormattingContext.Create(uri, documentContext.Snapshot, codeDocument, request.Options, _workspaceFactory);
-        foreach (var provider in applicableProviders)
-        {
-            if (provider.TryResolveInsertion(position, formattingContext, out var textEdit, out var format))
+        if (insertTextEdit is not null)
+        { 
+            return new VSInternalDocumentOnAutoInsertResponseItem()
             {
-                return new VSInternalDocumentOnAutoInsertResponseItem()
-                {
-                    TextEdit = textEdit,
-                    TextEditFormat = format,
-                };
-            }
+                TextEdit = insertTextEdit.Value.TextEdit,
+                TextEditFormat = insertTextEdit.Value.InsertTextFormat,
+            };
         }
 
         // No provider could handle the text edit.
@@ -130,7 +111,7 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
 
         if (positionInfo.LanguageKind == RazorLanguageKind.Html)
         {
-            if (!s_htmlAllowedTriggerCharacters.Contains(request.Character))
+            if (!AutoInsertService.HtmlAllowedAutoInsertTriggerCharacters.Contains(request.Character))
             {
                 Logger.LogInformation($"Inapplicable HTML trigger char {request.Character}.");
                 return SpecializedTasks.Null<IDelegatedParams>();
@@ -146,7 +127,7 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
         else if (positionInfo.LanguageKind == RazorLanguageKind.CSharp)
         {
-            if (!s_cSharpAllowedTriggerCharacters.Contains(request.Character))
+            if (!AutoInsertService.CSharpAllowedAutoInsertTriggerCharacters.Contains(request.Character))
             {
                 Logger.LogInformation($"Inapplicable C# trigger char {request.Character}.");
                 return SpecializedTasks.Null<IDelegatedParams>();

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hosting/VSInternalServerCapabilitiesExtensions.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.CodeAnalysis.Razor.SemanticTokens;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
@@ -65,4 +67,21 @@ public static void EnableMapCodeProvider(this VSInternalServerCapabilities serve
     {
         serverCapabilities.MapCodeProvider = true;
     }
+
+    public static void EnableOnAutoInsert(
+        this VSInternalServerCapabilities serverCapabilities,
+        IEnumerable<string> triggerCharacters)
+    {
+        serverCapabilities.OnAutoInsertProvider = new VSInternalDocumentOnAutoInsertOptions()
+            .EnableOnAutoInsert(triggerCharacters);
+    }
+
+    public static VSInternalDocumentOnAutoInsertOptions EnableOnAutoInsert(
+        this VSInternalDocumentOnAutoInsertOptions options,
+        IEnumerable<string> triggerCharacters)
+    {
+        options.TriggerCharacters = triggerCharacters.Distinct().ToArray();
+
+        return options;
+    }
 }

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

@@ -24,6 +24,8 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.SignatureHelp;
 using Microsoft.AspNetCore.Razor.LanguageServer.WrapWithTag;
 using Microsoft.AspNetCore.Razor.Telemetry;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.Razor.AutoInsert;
 using Microsoft.CodeAnalysis.Razor.FoldingRanges;
 using Microsoft.CodeAnalysis.Razor.GoToDefinition;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -135,12 +137,14 @@ protected override ILspServices ConstructLspServices()
         services.AddHoverServices();
         services.AddTextDocumentServices(featureOptions);
 
-        // Auto insert
-        services.AddSingleton<IOnAutoInsertProvider, CloseTextTagOnAutoInsertProvider>();
-        services.AddSingleton<IOnAutoInsertProvider, AutoClosingTagOnAutoInsertProvider>();
-
         if (!featureOptions.UseRazorCohostServer)
         {
+            // Auto insert
+            services.AddSingleton<IOnAutoInsertProvider, CloseTextTagOnAutoInsertProvider>();
+            services.AddSingleton<IOnAutoInsertProvider, AutoClosingTagOnAutoInsertProvider>();
+
+            services.AddSingleton<IAutoInsertService, AutoInsertService>();
+
             // Folding Range Providers
             services.AddSingleton<IRazorFoldingRangeProvider, RazorCodeBlockFoldingProvider>();
             services.AddSingleton<IRazorFoldingRangeProvider, RazorCSharpStatementFoldingProvider>();
@@ -177,7 +181,6 @@ static void AddHandlers(IServiceCollection services, LanguageServerFeatureOption
             services.AddTransient<IOnInitialized>(sp => sp.GetRequiredService<RazorConfigurationEndpoint>());
 
             services.AddHandlerWithCapabilities<ImplementationEndpoint>();
-            services.AddHandlerWithCapabilities<OnAutoInsertEndpoint>();
 
             if (!featureOptions.UseRazorCohostServer)
             {
@@ -187,6 +190,7 @@ static void AddHandlers(IServiceCollection services, LanguageServerFeatureOption
                 services.AddSingleton<IRenameService, RenameService>();
                 services.AddHandlerWithCapabilities<RenameEndpoint>();
 
+                services.AddHandlerWithCapabilities<OnAutoInsertEndpoint>();
                 services.AddHandlerWithCapabilities<DocumentHighlightEndpoint>();
                 services.AddHandlerWithCapabilities<SignatureHelpEndpoint>();
                 services.AddHandlerWithCapabilities<LinkedEditingRangeEndpoint>();