Fixed how workspace folders are requested

Author: david-driscoll

src/JsonRpc/IResponseRouter.cs

@@ -7,7 +7,8 @@ public interface IResponseRouter
     {
         void SendNotification<T>(string method, T @params);
         Task<TResponse> SendRequest<T, TResponse>(string method, T @params);
+        Task<TResponse> SendRequest<TResponse>(string method);
         Task SendRequest<T>(string method, T @params);
         TaskCompletionSource<JToken> GetRequest(long id);
     }
-}
+}

src/JsonRpc/ResponseRouter.cs

@@ -54,6 +54,34 @@ public async Task<TResponse> SendRequest<T, TResponse>(string method, T @params)
             }
         }
 
+        public async Task<TResponse> SendRequest<TResponse>(string method)
+        {
+            long nextId;
+            lock (_lock)
+            {
+                nextId = _id++;
+            }
+
+            var tcs = new TaskCompletionSource<JToken>();
+            _requests.TryAdd(nextId, tcs);
+
+            _outputHandler.Send(new Client.Request() {
+                Method = method,
+                Params = null,
+                Id = nextId
+            });
+
+            try
+            {
+                var result = await tcs.Task;
+                return result.ToObject<TResponse>(_serializer.JsonSerializer);
+            }
+            finally
+            {
+                _requests.TryRemove(nextId, out var _);
+            }
+        }
+
         public async Task SendRequest<T>(string method, T @params)
         {
             long nextId;

src/Protocol/Client/Capabilities/WorkspaceFoldersCapability.cs

@@ -1,4 +1,4 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class WorkspaceFolderCapability : DynamicCapability, ConnectedCapability<IWorkspaceFolderHandler> { }
+    public class WorkspaceFolderCapability : DynamicCapability { }
 }

src/Protocol/Workspace/IWorkspaceFolderHandler.cs renamed to src/Protocol/Workspace/WorkspaceFoldersExtensions.cs

@@ -1,6 +1,7 @@
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using System.Threading.Tasks;
 
 // ReSharper disable CheckNamespace
 
@@ -12,7 +13,12 @@ public static partial class WorkspaceNames
         public const string WorkspaceFolders = "workspace/workspaceFolders";
     }
 
-    [Parallel, Method(WorkspaceFolders)]
-    public interface IWorkspaceFolderHandler : IRequestHandler<Container<WorkspaceFolder>>, IRegistration<WorkspaceFolderRegistrationOptions>, ICapability<WorkspaceFolderCapability> { }
+    public static class WorkspaceFoldersExtensions
+    {
+        public static Task<Container<WorkspaceFolder>> WorkspaceFolders(this IResponseRouter mediator)
+        {
+            return mediator.SendRequest<Container<WorkspaceFolder>>(WorkspaceNames.WorkspaceFolders);
+        }
+    }
 }
 

src/Server/LanguageServer.cs

@@ -220,14 +220,14 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
                 ColorProvider = ccp.GetStaticOptions(textDocumentCapabilities.ColorProvider).Get<IColorOptions, StaticColorOptions>(ColorOptions.Of),
             };
 
-            if (_collection.ContainsHandler(typeof(IWorkspaceFolderHandler)))
+            if (_collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler)))
             {
                 serverCapabilities.Workspace = new WorkspaceServerCapabilities()
                 {
                     WorkspaceFolders = new WorkspaceFolderOptions()
                     {
                         Supported = true,
-                        ChangeNotifications = _collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler))
+                        ChangeNotifications = Guid.NewGuid().ToString()
                     }
                 };
             }
@@ -358,6 +358,11 @@ public Task<TResponse> SendRequest<T, TResponse>(string method, T @params)
             return _responseRouter.SendRequest<T, TResponse>(method, @params);
         }
 
+        public Task<TResponse> SendRequest<TResponse>(string method)
+        {
+            return _responseRouter.SendRequest<TResponse>(method);
+        }
+
         public Task SendRequest<T>(string method, T @params)
         {
             return _responseRouter.SendRequest(method, @params);