Merge pull request #75153 from matteo-prosperi/dev/jorobich/gladstone-spike

Updating to match Gladstone and Editor side changes

Author: JoeRobich

src/VisualStudio/Core/Def/LanguageServer/Handler/CustomMessage/CustomMessage.cs

@@ -8,11 +8,14 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler.CustomMessage;
 
-internal class CustomMessage(JsonNode message, TextDocumentPositionParams[] textDocumentPositions)
+internal class CustomMessage(JsonNode message, TextDocumentIdentifier? textDocument, Position[] positions)
 {
     [JsonPropertyName("message")]
     public JsonNode Message { get; } = Requires.NotNull(message);
 
-    [JsonPropertyName("textDocumentPositions")]
-    public TextDocumentPositionParams[] TextDocumentPositions { get; } = Requires.NotNull(textDocumentPositions);
+    [JsonPropertyName("textDocument")]
+    public TextDocumentIdentifier? TextDocument { get; } = textDocument;
+
+    [JsonPropertyName("positions")]
+    public Position[] Positions { get; } = Requires.NotNull(positions);
 }

src/VisualStudio/Core/Def/LanguageServer/Handler/CustomMessage/CustomMessageHandler.cs

@@ -12,6 +12,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Text;
 using Roslyn.LanguageServer.Protocol;
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler.CustomMessage;
@@ -21,7 +22,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.CustomMessage;
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
 internal class CustomMessageHandler()
-    : ILspServiceDocumentRequestHandler<CustomMessageParams, CustomMessage>
+    : ILspServiceDocumentRequestHandler<CustomMessageParams, CustomResponse>
 {
     private const string MethodName = "roslyn/customMessage";
 
@@ -31,12 +32,12 @@ internal class CustomMessageHandler()
 
     public TextDocumentIdentifier GetTextDocumentIdentifier(CustomMessageParams request)
     {
-        return request.Message.TextDocumentPositions.First().TextDocument;
+        return request.Message.TextDocument!;
     }
 
-    public async Task<CustomMessage> HandleRequestAsync(CustomMessageParams request, RequestContext context, CancellationToken cancellationToken)
+    public async Task<CustomResponse> HandleRequestAsync(CustomMessageParams request, RequestContext context, CancellationToken cancellationToken)
     {
-        return request.Message;
+        return new CustomResponse(request.Message.Message, request.Message.Positions);
 
 #pragma warning disable CS0162 // Unreachable code detected
         AppDomain? appDomain = null;
@@ -74,24 +75,36 @@ public async Task<CustomMessage> HandleRequestAsync(CustomMessageParams request,
             var assembly = appDomain.Load(assemblyName);
 
             var handlerType = assembly.GetType(request.TypeFullName);
-            var handlerMethod = handlerType.GetMethod("ExecuteAsync", BindingFlags.Static);
+            var handlerMethod = handlerType.GetMethod("ExecuteAsync", BindingFlags.Instance);
 
-            var messageType = handlerMethod.GetParameters()[0].ParameterType;
-            var deserializedMessage = JsonSerializer.Deserialize(request.Message.Message, messageType);
+            JsonSerializerOptions readOptions = new();
+            LinePositionReadConverter linePositionReadConverter = new(request.Message.Positions.Select(tdp => ProtocolConversions.PositionToLinePosition(tdp)).ToArray());
+            readOptions.Converters.Add(linePositionReadConverter);
 
-            var linePositions = request.Message.TextDocumentPositions.Select(tdp => ProtocolConversions.PositionToLinePosition(tdp.Position)).ToArray();
+            var messageType = handlerMethod.GetParameters()[0].ParameterType;
+            var deserializedMessage = JsonSerializer.Deserialize(request.Message.Message, messageType, readOptions);
 
-            var parameters = new object?[] { deserializedMessage, context.Document, linePositions, cancellationToken };
-            var resultTask = (Task)handlerMethod.Invoke(null, parameters);
+            var handler = Activator.CreateInstance(handlerType);
+            var parameters = new object?[] { deserializedMessage, context.Document, cancellationToken };
+            var resultTask = (Task)handlerMethod.Invoke(handler, parameters);
 
             await resultTask.ConfigureAwait(false);
 
             var resultProperty = resultTask.GetType().GetProperty("Result");
             var result = resultProperty.GetValue(resultTask);
 
-            var resultJson = JsonSerializer.Serialize(result, resultProperty.PropertyType);
+            JsonSerializerOptions writeOptions = new();
+            LinePositionWriteConverter linePositionWriteConverter = new();
+            writeOptions.Converters.Add(linePositionWriteConverter);
+
+            var resultJson = JsonSerializer.Serialize(result, resultProperty.PropertyType, writeOptions);
 
-            return new CustomMessage(JsonNode.Parse(resultJson)!, []);
+            return new CustomResponse(
+                JsonNode.Parse(resultJson)!,
+                linePositionWriteConverter.LinePositions
+                    .OrderBy(p => p.Value)
+                    .Select(p => new Position(p.Key.Line, p.Key.Character))
+                    .ToArray());
         }
         finally
         {

src/VisualStudio/Core/Def/LanguageServer/Handler/CustomMessage/CustomResponse.cs

@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using Roslyn.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.LanguageServer.Handler.CustomMessage;
+
+internal class CustomResponse(JsonNode message, Position[] positions)
+{
+    [JsonPropertyName("message")]
+    public JsonNode Message { get; } = Requires.NotNull(message);
+
+    [JsonPropertyName("positions")]
+    public Position[] Positions { get; } = Requires.NotNull(positions);
+}

src/VisualStudio/Core/Def/LanguageServer/Handler/CustomMessage/LinePositionReadConverter.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.LanguageServer.Handler.CustomMessage;
+
+internal class LinePositionReadConverter : JsonConverter<LinePosition>
+{
+    private readonly IReadOnlyList<LinePosition> linePositions;
+
+    public LinePositionReadConverter(IReadOnlyList<LinePosition> linePositions)
+    {
+        this.linePositions = linePositions;
+    }
+
+    public override LinePosition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.Number)
+        {
+            throw new JsonException();
+        }
+
+        return this.linePositions[reader.GetInt32()];
+    }
+
+    public override void Write(Utf8JsonWriter writer, LinePosition value, JsonSerializerOptions options)
+    {
+        throw new NotSupportedException();
+    }
+}

src/VisualStudio/Core/Def/LanguageServer/Handler/CustomMessage/LinePositionWriteConverter.cs

@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.LanguageServer.Handler.CustomMessage;
+
+internal class LinePositionWriteConverter : JsonConverter<LinePosition>
+{
+    public Dictionary<LinePosition, int> LinePositions { get; } = new();
+
+    public override LinePosition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        throw new NotSupportedException();
+    }
+
+    public override void Write(Utf8JsonWriter writer, LinePosition value, JsonSerializerOptions options)
+    {
+        if (!this.LinePositions.TryGetValue(value, out var index))
+        {
+            index = this.LinePositions.Count;
+            this.LinePositions.Add(value, index);
+        }
+
+        writer.WriteNumberValue(index);
+    }
+}