From 182e547f34a4618eebf3639b7fe2d1ade8bd56e0 Mon Sep 17 00:00:00 2001 From: Allison Chou Date: Wed, 12 Feb 2020 11:24:48 -0800 Subject: [PATCH] Moving methods around --- .../LanguageClient/InProcLanguageServer.cs | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs index 5ce53d5ccfd..643b49ff2e5 100644 --- a/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs +++ b/src/VisualStudio/Core/Def/Implementation/LanguageClient/InProcLanguageServer.cs @@ -5,7 +5,6 @@ #nullable enable using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; @@ -73,7 +72,17 @@ public async Task Initialize(JToken input, CancellationToken c }; var serializer = JsonSerializer.Create(settings); - // Publish diagnostics for all open documents upon initialization. + // InitializeParams only references ClientCapabilities, but the VS LSP client + // sends additional VS specific capabilities, so directly deserialize them into the VSClientCapabilities + // to avoid losing them. + _clientCapabilities = input["capabilities"].ToObject(serializer); + return await _protocol.InitializeAsync(_workspace.CurrentSolution, input.ToObject(serializer), _clientCapabilities, cancellationToken).ConfigureAwait(false); + } + + [JsonRpcMethod(Methods.InitializedName)] + public Task Initialized() + { + // Publish diagnostics for all open documents after initialization. var openDocuments = _workspace.GetOpenDocumentIds(); foreach (var documentId in openDocuments) { @@ -84,16 +93,9 @@ public async Task Initialize(JToken input, CancellationToken c } } - // InitializeParams only references ClientCapabilities, but the VS LSP client - // sends additional VS specific capabilities, so directly deserialize them into the VSClientCapabilities - // to avoid losing them. - _clientCapabilities = input["capabilities"].ToObject(serializer); - return await _protocol.InitializeAsync(_workspace.CurrentSolution, input.ToObject(serializer), _clientCapabilities, cancellationToken).ConfigureAwait(false); + return Task.CompletedTask; } - [JsonRpcMethod(Methods.InitializedName)] - public Task Initialized() => Task.CompletedTask; - [JsonRpcMethod(Methods.ShutdownName)] public object? Shutdown(CancellationToken _) => null; -- GitLab