Cohosting OnAutoInsert endpoint

eng/targets/Services.props

@@ -28,5 +28,6 @@
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.DocumentSymbol" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteDocumentSymbolService+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

@@ -2,7 +2,9 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Frozen;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -12,6 +14,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 +29,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 +53,17 @@ 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,
+                .. AutoInsertService.HtmlAllowedAutoInsertTriggerCharacters,
+                .. 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 +84,18 @@ 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)
+        if (_autoInsertService.TryResolveInsertion(
+                codeDocument,
+                request.Position,
+                character,
+                _optionsMonitor.CurrentValue.AutoClosingTags,
+                out var insertTextEdit))
         {
-            // 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 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))
+            return new VSInternalDocumentOnAutoInsertResponseItem()
             {
-                return new VSInternalDocumentOnAutoInsertResponseItem()
-                {
-                    TextEdit = textEdit,
-                    TextEditFormat = format,
-                };
-            }
+                TextEdit = insertTextEdit.TextEdit,
+                TextEditFormat = insertTextEdit.TextEditFormat,
+            };
         }
 
         // No provider could handle the text edit.
@@ -130,7 +112,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 +128,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/Formatting/LspFormattingCodeDocumentProvider.cs

@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor.Formatting;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
+
+internal sealed class LspFormattingCodeDocumentProvider : IFormattingCodeDocumentProvider
+{
+    public Task<RazorCodeDocument> GetCodeDocumentAsync(IDocumentSnapshot snapshot)
+    {
+        var useDesignTimeGeneratedOutput = snapshot.Project.Configuration.LanguageServerFlags?.ForceRuntimeCodeGeneration ?? false;
+        return snapshot.GetGeneratedOutputAsync(useDesignTimeGeneratedOutput);
+    }
+}

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

@@ -1,12 +1,14 @@
 // 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;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 
-internal static class VSInternalServerCapabilitiesExtensions
+internal static class LspInitializationHelpers
 {
     public static void EnableInlayHints(this VSInternalServerCapabilities serverCapabilities)
     {
@@ -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/InlineCompletion/InlineCompletionEndPoint.cs

@@ -28,6 +28,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.InlineCompletion;
 internal sealed class InlineCompletionEndpoint(
     IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
+    IFormattingCodeDocumentProvider formattingCodeDocumentProvider,
     IAdhocWorkspaceFactory adhocWorkspaceFactory,
     ILoggerFactory loggerFactory)
     : IRazorRequestHandler<VSInternalInlineCompletionRequest, VSInternalInlineCompletionList?>, ICapabilitiesProvider
@@ -39,6 +40,7 @@ internal sealed class InlineCompletionEndpoint(
 
     private readonly IDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
     private readonly IClientConnection _clientConnection = clientConnection ?? throw new ArgumentNullException(nameof(clientConnection));
+    private readonly IFormattingCodeDocumentProvider _formattingCodeDocumentProvider = formattingCodeDocumentProvider;
     private readonly IAdhocWorkspaceFactory _adhocWorkspaceFactory = adhocWorkspaceFactory ?? throw new ArgumentNullException(nameof(adhocWorkspaceFactory));
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<InlineCompletionEndpoint>();
 
@@ -123,7 +125,13 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(VSInternalInlineCompleti
                 continue;
             }
 
-            using var formattingContext = FormattingContext.Create(request.TextDocument.Uri, documentContext.Snapshot, codeDocument, request.Options, _adhocWorkspaceFactory);
+            using var formattingContext = FormattingContext.Create(
+                request.TextDocument.Uri,
+                documentContext.Snapshot,
+                codeDocument,
+                request.Options,
+                _formattingCodeDocumentProvider,
+                _adhocWorkspaceFactory);
             if (!TryGetSnippetWithAdjustedIndentation(formattingContext, item.Text, hostDocumentIndex, out var newSnippetText))
             {
                 continue;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;

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

@@ -14,6 +14,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
 using Microsoft.AspNetCore.Razor.LanguageServer.FindAllReferences;
 using Microsoft.AspNetCore.Razor.LanguageServer.Folding;
+using Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.LanguageServer.Implementation;
 using Microsoft.AspNetCore.Razor.LanguageServer.InlayHints;
@@ -24,7 +25,9 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.SignatureHelp;
 using Microsoft.AspNetCore.Razor.LanguageServer.WrapWithTag;
 using Microsoft.AspNetCore.Razor.Telemetry;
+using Microsoft.CodeAnalysis.Razor.AutoInsert;
 using Microsoft.CodeAnalysis.Razor.FoldingRanges;
+using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.GoToDefinition;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Protocol.DocumentSymbols;
@@ -119,6 +122,8 @@ protected override ILspServices ConstructLspServices()
         services.AddSingleton<IAdhocWorkspaceFactory, AdhocWorkspaceFactory>();
         services.AddSingleton<IWorkspaceProvider, LspWorkspaceProvider>();
 
+        services.AddSingleton<IFormattingCodeDocumentProvider, LspFormattingCodeDocumentProvider>();
+
         var featureOptions = _featureOptions ?? new DefaultLanguageServerFeatureOptions();
         services.AddSingleton(featureOptions);
 
@@ -136,12 +141,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>();
@@ -178,7 +185,6 @@ static void AddHandlers(IServiceCollection services, LanguageServerFeatureOption
             services.AddTransient<IOnInitialized>(sp => sp.GetRequiredService<RazorConfigurationEndpoint>());
 
             services.AddHandlerWithCapabilities<ImplementationEndpoint>();
-            services.AddHandlerWithCapabilities<OnAutoInsertEndpoint>();
 
             if (!featureOptions.UseRazorCohostServer)
             {
@@ -188,6 +194,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>();