Merge pull request #84 from OmniSharp/spec/updates

Spec/updates

Author: david-driscoll

sample/SampleServer/TextDocumentHandler.cs

@@ -66,6 +66,7 @@ public void SetCapability(SynchronizationCapability capability)
 
         public async Task Handle(DidOpenTextDocumentParams notification)
         {
+            await Task.Yield();
             _router.LogMessage(new LogMessageParams()
             {
                 Type = MessageType.Log,

src/Client/LanguageClient.cs

@@ -157,7 +157,7 @@ public void Dispose()
         /// </summary>
         public ClientCapabilities ClientCapabilities { get; } = new ClientCapabilities
         {
-            Workspace = new WorkspaceClientCapabilites
+            Workspace = new WorkspaceClientCapabilities
             {
                 DidChangeConfiguration = new DidChangeConfigurationCapability
                 {

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/ClientCapabilities.cs

@@ -10,7 +10,7 @@ public class ClientCapabilities
         /// <summary>
         /// Workspace specific client capabilities.
         /// </summary>
-        public WorkspaceClientCapabilites Workspace { get; set; }
+        public WorkspaceClientCapabilities Workspace { get; set; }
 
         /// <summary>
         /// Text document specific client capabilities.

src/Protocol/Client/Capabilities/ColorProviderCapability.cs

@@ -0,0 +1,4 @@
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    public class ColorProviderCapability : DynamicCapability, ConnectedCapability<IDocumentColorHandler>, ConnectedCapability<IColorPresentationHandler> {}
+}

src/Protocol/Client/Capabilities/DidChangeWorkspaceFolderCapability.cs

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

src/Protocol/Client/Capabilities/ImplementationCapability.cs

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

src/Protocol/Client/Capabilities/PublishDiagnosticsCapability.cs

@@ -0,0 +1,16 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    /// <summary>
+    /// Capabilities specific to `textDocument/publishDiagnostics`.
+    /// </summary>
+    public class PublishDiagnosticsCapability
+    {
+        /// <summary>
+        /// Whether the clients accepts diagnostics with related information.
+        /// </summary>
+        [Optional]
+        public bool RelatedInformation { get; set; }
+    }
+}

src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

@@ -77,5 +77,31 @@ public class TextDocumentClientCapabilities
         /// Capabilities specific to the `textDocument/rename`
         /// </summary>
         public Supports<RenameCapability> Rename { get; set; }
+
+        /// <summary>
+        /// Capabilities specific to the `textDocument/typeDefinition`
+        ///
+        /// Since 3.6.0
+        /// </summary>
+        public Supports<TypeDefinitionCapability> TypeDefinition { get; set; }
+
+        /// <summary>
+        /// Capabilities specific to the `textDocument/implementation`
+        ///
+        /// Since 3.6.0
+        /// </summary>
+        public Supports<ImplementationCapability> Implementation { get; set; }
+
+        /// <summary>
+        /// Capabilities specific to the `textDocument/documentColor` and the `textDocument/colorPresentation` request.
+        ///
+        /// Since 3.6.0
+        /// </summary>
+        public Supports<ColorProviderCapability> ColorProvider { get; set; }
+
+        /// <summary>
+        /// Capabilities specific to `textDocument/publishDiagnostics`.
+        /// </summary>
+        public Supports<PublishDiagnosticsCapability> PublishDiagnostics { get; set; }
     }
 }