Skip to content

Port auto insert to VS Code #11828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

Port auto insert to VS Code #11828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
041f437
Port auto insert to VS Code
davidwengier May 7, 2025
87f9fa9
Fix test
davidwengier May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...CodeAnalysis.Razor.CohostingShared/Microsoft.CodeAnalysis.Razor.CohostingShared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<Compile Include="$(MSBuildThisFileDirectory)LinkedEditingRange\CohostLinkedEditingRangeEndpoint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Formatting\CohostOnTypeFormattingEndpoint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Formatting\CohostRangeFormattingEndpoint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OnAutoInsert\CohostOnAutoInsertEndpoint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OnAutoInsert\CohostOnAutoInsertTriggerCharacterProviders.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Rename\CohostRenameEndpoint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SignatureHelp\CohostSignatureHelpEndpoint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)FoldingRange\CohostFoldingRangeEndpoint.cs" />
Expand Down
10 changes: 7 additions & 3 deletions ...ient/Cohost/CohostOnAutoInsertEndpoint.cs → ...nAutoInsert/CohostOnAutoInsertEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
using Microsoft.CodeAnalysis.Razor.AutoInsert;
using Microsoft.CodeAnalysis.Razor.Formatting;
using Microsoft.CodeAnalysis.Razor.Logging;
Expand All @@ -26,10 +27,10 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.LanguageClient.Cohost;
[Shared]
[CohostEndpoint(VSInternalMethods.OnAutoInsertName)]
[Export(typeof(IDynamicRegistrationProvider))]
[ExportCohostStatelessLspService(typeof(CohostOnAutoInsertEndpoint))]
[ExportRazorStatelessLspService(typeof(CohostOnAutoInsertEndpoint))]
[method: ImportingConstructor]
#pragma warning restore RS0030 // Do not use banned APIs
internal class CohostOnAutoInsertEndpoint(
internal sealed class CohostOnAutoInsertEndpoint(
IRemoteServiceInvoker remoteServiceInvoker,
IClientSettingsManager clientSettingsManager,
#pragma warning disable RS0030 // Do not use banned APIs
Expand All @@ -52,7 +53,10 @@ private static ImmutableArray<string> CalculateTriggerChars(IEnumerable<IOnAutoI

ImmutableArray<string> triggerCharacters = [
.. providerTriggerCharacters,
#if !VSCODE
// VS Code's auto insert functionality is poly-filled by Roslyn. The Html server has no support for it.
.. AutoInsertService.HtmlAllowedAutoInsertTriggerCharacters,
#endif
.. AutoInsertService.CSharpAllowedAutoInsertTriggerCharacters ];

return triggerCharacters;
Expand All @@ -64,7 +68,7 @@ private static ImmutableArray<string> CalculateTriggerChars(IEnumerable<IOnAutoI

public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilities clientCapabilities, RazorCohostRequestContext requestContext)
{
if (clientCapabilities.SupportsVisualStudioExtensions)
if ((clientCapabilities.TextDocument as VSInternalTextDocumentClientCapabilities)?.OnAutoInsert?.DynamicRegistration == true)
{
return [new Registration
{
Expand Down
0 ...tOnAutoInsertTriggerCharacterProviders.cs → ...tOnAutoInsertTriggerCharacterProviders.cs
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...azor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void RegistrationsProvideFilter()
var clientCapabilities = new VSInternalClientCapabilities()
{
SupportsVisualStudioExtensions = true,
TextDocument = new TextDocumentClientCapabilities()
TextDocument = new VSInternalTextDocumentClientCapabilities()
{
CodeAction = new() { DynamicRegistration = true },
CodeLens = new() { DynamicRegistration = true },
Expand All @@ -87,6 +87,7 @@ public void RegistrationsProvideFilter()
Implementation = new() { DynamicRegistration = true },
InlayHint = new() { DynamicRegistration = true },
LinkedEditingRange = new() { DynamicRegistration = true },
OnAutoInsert = new() { DynamicRegistration = true },
OnTypeFormatting = new() { DynamicRegistration = true },
RangeFormatting = new() { DynamicRegistration = true },
References = new() { DynamicRegistration = true },
Expand Down