diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterHandler.cs b/src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionHandler.cs similarity index 76% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterHandler.cs rename to src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionHandler.cs index 298a7cfa386b8..df1f202fe5b8f 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterHandler.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionHandler.cs @@ -11,16 +11,16 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; -[ExportCSharpVisualBasicStatelessLspService(typeof(ExtensionRegisterHandler)), Shared] +[ExportCSharpVisualBasicStatelessLspService(typeof(ActivateExtensionHandler)), Shared] [Method(MethodName)] [method: ImportingConstructor] [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] -internal sealed class ExtensionRegisterHandler() - : AbstractExtensionHandler, ILspServiceRequestHandler +internal sealed class ActivateExtensionHandler() + : AbstractExtensionHandler, ILspServiceRequestHandler { - private const string MethodName = "roslyn/extensionRegister"; + private const string MethodName = "server/_vs_activateExtension"; - public async Task HandleRequestAsync(ExtensionRegisterParams request, RequestContext context, CancellationToken cancellationToken) + public async Task HandleRequestAsync(ActivateExtensionParams request, RequestContext context, CancellationToken cancellationToken) { Contract.ThrowIfNull(context.Solution); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterParams.cs b/src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionParams.cs similarity index 82% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterParams.cs rename to src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionParams.cs index 2eea4e6003e19..297fc98cfb396 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterParams.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionParams.cs @@ -7,8 +7,8 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; /// -/// Parameters for the roslyn/extensionRegister request. +/// Parameters for the server/_vs_activateExtension request. /// /// Full path to the assembly that contains the message handlers to register. -internal readonly record struct ExtensionRegisterParams( +internal readonly record struct ActivateExtensionParams( [property: JsonPropertyName("assemblyFilePath")] string AssemblyFilePath); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterResponse.cs b/src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionResponse.cs similarity index 90% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterResponse.cs rename to src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionResponse.cs index b9eec3ac37b89..905f9bf11333d 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterResponse.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/ActivateExtensionResponse.cs @@ -9,12 +9,12 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; /// -/// Response for the roslyn/extensionRegister request. +/// Response for the server/_vs_activateExtension request. /// /// Names of the registered non-document-specific extension message handlers. /// Names of the registered document-specific extension message handlers. /// Details of any exceptions that occurred during extension registration. -internal sealed record class ExtensionRegisterResponse( +internal sealed record class ActivateExtensionResponse( [property: JsonPropertyName("workspaceMessageHandlers")] ImmutableArray WorkspaceMessageHandlers, [property: JsonPropertyName("documentMessageHandlers")] ImmutableArray DocumentMessageHandlers, [property: JsonPropertyName("extensionException"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] Exception? ExtensionException); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionUnregisterHandler.cs b/src/LanguageServer/Protocol/Handler/Extensions/DeactivateExtensionHandler.cs similarity index 67% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionUnregisterHandler.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DeactivateExtensionHandler.cs index 9903fb9153774..e6390cf2daa28 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionUnregisterHandler.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DeactivateExtensionHandler.cs @@ -11,16 +11,16 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; -[ExportCSharpVisualBasicStatelessLspService(typeof(ExtensionUnregisterHandler)), Shared] +[ExportCSharpVisualBasicStatelessLspService(typeof(DeactivateExtensionHandler)), Shared] [Method(MethodName)] [method: ImportingConstructor] [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] -internal sealed class ExtensionUnregisterHandler() - : AbstractExtensionHandler, ILspServiceNotificationHandler +internal sealed class DeactivateExtensionHandler() + : AbstractExtensionHandler, ILspServiceNotificationHandler { - private const string MethodName = "roslyn/extensionUnregister"; + private const string MethodName = "server/_vs_deactivateExtension"; - public async Task HandleNotificationAsync(ExtensionUnregisterParams request, RequestContext context, CancellationToken cancellationToken) + public async Task HandleNotificationAsync(DeactivateExtensionParams request, RequestContext context, CancellationToken cancellationToken) { Contract.ThrowIfNull(context.Solution); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionUnregisterParams.cs b/src/LanguageServer/Protocol/Handler/Extensions/DeactivateExtensionParams.cs similarity index 81% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionUnregisterParams.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DeactivateExtensionParams.cs index 6da8c8b12b204..c0335285a4273 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionUnregisterParams.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DeactivateExtensionParams.cs @@ -7,8 +7,8 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; /// -/// Parameters for the roslyn/extensionUnregister request. +/// Parameters for the server/_vs_deactivateExtension request. /// /// Full path to the assembly that contains the message handlers to unregister. -internal readonly record struct ExtensionUnregisterParams( +internal readonly record struct DeactivateExtensionParams( [property: JsonPropertyName("assemblyFilePath")] string AssemblyFilePath); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageHandler.cs b/src/LanguageServer/Protocol/Handler/Extensions/DispatchDocumentExtensionMessageHandler.cs similarity index 65% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageHandler.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DispatchDocumentExtensionMessageHandler.cs index 6410ecf884965..045895394074f 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageHandler.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DispatchDocumentExtensionMessageHandler.cs @@ -12,19 +12,19 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; -[ExportCSharpVisualBasicStatelessLspService(typeof(ExtensionDocumentMessageHandler)), Shared] +[ExportCSharpVisualBasicStatelessLspService(typeof(DispatchDocumentExtensionMessageHandler)), Shared] [Method(MethodName)] [method: ImportingConstructor] [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] -internal sealed class ExtensionDocumentMessageHandler() - : AbstractExtensionHandler, ILspServiceDocumentRequestHandler +internal sealed class DispatchDocumentExtensionMessageHandler() + : AbstractExtensionHandler, ILspServiceDocumentRequestHandler { - private const string MethodName = "roslyn/extensionDocumentMessage"; + private const string MethodName = "textDocument/_vs_dipatchExtensionMessage"; - public TextDocumentIdentifier GetTextDocumentIdentifier(ExtensionDocumentMessageParams request) + public TextDocumentIdentifier GetTextDocumentIdentifier(DispatchDocumentExtensionMessageParams request) => request.TextDocument; - public async Task HandleRequestAsync(ExtensionDocumentMessageParams request, RequestContext context, CancellationToken cancellationToken) + public async Task HandleRequestAsync(DispatchDocumentExtensionMessageParams request, RequestContext context, CancellationToken cancellationToken) { Contract.ThrowIfNull(context.Document); @@ -38,6 +38,6 @@ public async Task HandleRequestAsync(ExtensionDocument if (exception is not null) context.Logger.LogException(exception); - return new ExtensionMessageResponse(response, extensionWasUnloaded, exception); + return new DispatchExtensionMessageResponse(response, extensionWasUnloaded, exception); } } diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageParams.cs b/src/LanguageServer/Protocol/Handler/Extensions/DispatchDocumentExtensionMessageParams.cs similarity index 85% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageParams.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DispatchDocumentExtensionMessageParams.cs index 0b7881f65199f..f832a375e5e61 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageParams.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DispatchDocumentExtensionMessageParams.cs @@ -8,12 +8,12 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; /// -/// Parameters for the roslyn/extensionDocumentMessage request. +/// Parameters for the textDocument/_vs_dipatchExtensionMessage request. /// /// Name of the extension message to be invoked. /// Json message to be passed to an extension message handler. /// Text document the refers to. -internal readonly record struct ExtensionDocumentMessageParams( +internal readonly record struct DispatchDocumentExtensionMessageParams( [property: JsonPropertyName("messageName")] string MessageName, [property: JsonPropertyName("message")] string Message, [property: JsonPropertyName("textDocument")] TextDocumentIdentifier TextDocument); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionMessageResponse.cs b/src/LanguageServer/Protocol/Handler/Extensions/DispatchExtensionMessageResponse.cs similarity index 85% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionMessageResponse.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DispatchExtensionMessageResponse.cs index 502169dc705be..525625d56ad00 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionMessageResponse.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DispatchExtensionMessageResponse.cs @@ -8,12 +8,12 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; /// -/// Return type for the roslyn/extensionWorkspaceMessage and roslyn/extensionDocumentMessage request. +/// Return type for the workspace/_vs_dispatchExtensionMessage and textDocument/_vs_dipatchExtensionMessage request. /// /// Json response returned by the extension message handler. Can be if the /// extension was unloaded concurrently with the response being issued, or if the extension threw an exception while /// processing. -internal readonly record struct ExtensionMessageResponse( +internal readonly record struct DispatchExtensionMessageResponse( [property: JsonPropertyName("response"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] string? Response, [property: JsonPropertyName("extensionWasUnloaded"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)] bool ExtensionWasUnloaded, [property: JsonPropertyName("extensionException"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] Exception? ExtensionException); diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageHandler.cs b/src/LanguageServer/Protocol/Handler/Extensions/DispatchWorkspaceExtensionMessageHandler.cs similarity index 63% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageHandler.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DispatchWorkspaceExtensionMessageHandler.cs index 917721bc2a9c8..28ddf62624c8e 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageHandler.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DispatchWorkspaceExtensionMessageHandler.cs @@ -11,16 +11,16 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; -[ExportCSharpVisualBasicStatelessLspService(typeof(ExtensionWorkspaceMessageHandler)), Shared] +[ExportCSharpVisualBasicStatelessLspService(typeof(DispatchWorkspaceExtensionMessageHandler)), Shared] [Method(MethodName)] [method: ImportingConstructor] [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] -internal sealed class ExtensionWorkspaceMessageHandler() - : AbstractExtensionHandler, ILspServiceRequestHandler +internal sealed class DispatchWorkspaceExtensionMessageHandler() + : AbstractExtensionHandler, ILspServiceRequestHandler { - private const string MethodName = "roslyn/extensionWorkspaceMessage"; + private const string MethodName = "workspace/_vs_dispatchExtensionMessage"; - public async Task HandleRequestAsync(ExtensionWorkspaceMessageParams request, RequestContext context, CancellationToken cancellationToken) + public async Task HandleRequestAsync(DispatchWorkspaceExtensionMessageParams request, RequestContext context, CancellationToken cancellationToken) { Contract.ThrowIfNull(context.Solution); @@ -34,6 +34,6 @@ public async Task HandleRequestAsync(ExtensionWorkspac if (exception is not null) context.Logger.LogException(exception); - return new ExtensionMessageResponse(response, extensionWasUnloaded, exception); + return new DispatchExtensionMessageResponse(response, extensionWasUnloaded, exception); } } diff --git a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageParams.cs b/src/LanguageServer/Protocol/Handler/Extensions/DispatchWorkspaceExtensionMessageParams.cs similarity index 82% rename from src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageParams.cs rename to src/LanguageServer/Protocol/Handler/Extensions/DispatchWorkspaceExtensionMessageParams.cs index 73f8d9665e09c..e3b7d10ecfba0 100644 --- a/src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageParams.cs +++ b/src/LanguageServer/Protocol/Handler/Extensions/DispatchWorkspaceExtensionMessageParams.cs @@ -8,10 +8,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions; /// -/// Parameters for the roslyn/extensionWorkspaceMessage request. +/// Parameters for the workspace/_vs_dispatchExtensionMessage request. /// /// Name of the extension message to be invoked. /// Json message to be passed to an extension message handler. -internal readonly record struct ExtensionWorkspaceMessageParams( +internal readonly record struct DispatchWorkspaceExtensionMessageParams( [property: JsonPropertyName("messageName")] string MessageName, [property: JsonPropertyName("message")] string Message);