Merge branch 'feature/v3_6_0'

Author: matarillo

LanguageServer/Client/WorkspaceProxy.cs

@@ -38,5 +38,49 @@ public Task<Result<ApplyWorkspaceEditResponse, ResponseError>> ApplyEdit(ApplyWo
                 (ResponseMessage<ApplyWorkspaceEditResponse, ResponseError> res) => tcs.TrySetResult(Message.ToResult(res)));
             return tcs.Task;
         }
+
+        /// <summary>
+        /// The <c>workspace/workspaceFolders</c> request is sent from the server to the client
+        /// to fetch the current open list of workspace folders. 
+        /// </summary>
+        /// <returns>
+        /// Returns <c>null</c> in the response if only a single file is open in the tool.
+        /// Returns an empty array if a workspace is open but no folders are configured.
+        /// </returns>
+        /// <seealso>Spec 3.6.0</seealso>
+        public Task<Result<WorkspaceFolder[], ResponseError>> WorkspaceFolders()
+        {
+            var tcs = new TaskCompletionSource<Result<WorkspaceFolder[], ResponseError>>();
+            _connection.SendRequest(
+                new VoidRequestMessage
+                {
+                    id = IdGenerator.Instance.Next(),
+                    method = "workspace/workspaceFolders"
+                },
+                (ResponseMessage<WorkspaceFolder[], ResponseError> res) => tcs.TrySetResult(Message.ToResult(res)));
+            return tcs.Task;
+        }
+
+        /// <summary>
+        /// The <c>workspace/configuration</c> request is sent from the server to the client
+        /// to fetch configuration settings from the client.
+        /// The request can fetch n configuration settings in one roundtrip. 
+        /// </summary>
+        /// <param name="params">configuration sections asked for</param>
+        /// <returns>configuration settings</returns>
+        /// <seealso>Spec 3.6.0</seealso>
+        public Task<Result<dynamic[], ResponseError>> Configuration(ConfigurationParams @params)
+        {
+            var tcs = new TaskCompletionSource<Result<dynamic[], ResponseError>>();
+            _connection.SendRequest(
+                new RequestMessage<ConfigurationParams>
+                {
+                    id = IdGenerator.Instance.Next(),
+                    method = "workspace/configuration",
+                    @params = @params
+                },
+                (ResponseMessage<dynamic[], ResponseError> res) => tcs.TrySetResult(Message.ToResult(res)));
+            return tcs.Task;
+        }
     }
 }

LanguageServer/Infrastructure/JsonDotNet/EitherConverter.cs

@@ -25,6 +25,8 @@ public EitherConverter()
             table = new Dictionary<Type, Func<JToken, object>>();
             table[typeof(NumberOrString)] = token => (object)ToNumberOrString(token);
             table[typeof(LocationSingleOrArray)] = token => (object)ToLocationSingleOrArray(token);
+            table[typeof(ChangeNotificationsOptions)] = token => (object)ToChangeNotificationsOptions(token);
+            table[typeof(ProviderOptionsOrBoolean)] = token => (object)ToProviderOptionsOrBoolean(token);
             table[typeof(TextDocumentSync)] = token => (object)ToTextDocumentSync(token);
             table[typeof(Documentation)] = token => (object)ToDocumentation(token);
             table[typeof(CompletionResult)] = token => (object)ToCompletionResult(token);
@@ -89,6 +91,36 @@ private LocationSingleOrArray ToLocationSingleOrArray(JToken token)
             }
         }
 
+        private ChangeNotificationsOptions ToChangeNotificationsOptions(JToken token)
+        {
+            switch (token.Type)
+            {
+                case JTokenType.Null:
+                    return null;
+                case JTokenType.Boolean:
+                    return new ChangeNotificationsOptions(token.ToObject<bool>());
+                case JTokenType.String:
+                    return new ChangeNotificationsOptions(token.ToObject<string>());
+                default:
+                    throw new JsonSerializationException();
+            }
+        }
+
+        private ProviderOptionsOrBoolean ToProviderOptionsOrBoolean(JToken token)
+        {
+            switch (token.Type)
+            {
+                case JTokenType.Null:
+                    return null;
+                case JTokenType.Boolean:
+                    return new ProviderOptionsOrBoolean(token.ToObject<bool>());
+                case JTokenType.Object:
+                    return new ProviderOptionsOrBoolean(token.ToObject<ProviderOptions>());
+                default:
+                    throw new JsonSerializationException();
+            }
+        }
+
         private TextDocumentSync ToTextDocumentSync(JToken token)
         {
             switch (token.Type)

LanguageServer/Json/Either.cs

@@ -10,10 +10,10 @@ namespace LanguageServer.Json
     /// <list type="bullet">
     /// <item><description><see cref="NumberOrString"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.LocationSingleOrArray"/></description></item>
-    /// <item><description><see cref="LanguageServer.Parameters.General.ChangeNotifications"/></description></item>
+    /// <item><description><see cref="LanguageServer.Parameters.General.ChangeNotificationsOptions"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.General.ColorProviderCapabilities"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.General.FoldingRangeProviderCapabilities"/></description></item>
-    /// <item><description><see cref="LanguageServer.Parameters.General.ProviderCapabilities"/></description></item>
+    /// <item><description><see cref="LanguageServer.Parameters.General.ProviderOptionsOrBoolean"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.General.TextDocumentSync"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.TextDocument.CodeActionResult"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.TextDocument.Documentation"/></description></item>

LanguageServer/Parameters/General/ChangeNotificationsOptions.cs

@@ -0,0 +1,47 @@
+using LanguageServer.Json;
+
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <seealso>Spec 3.6.0</seealso>
+    public class ChangeNotificationsOptions : Either
+    {
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="string"/> to a <see cref="ChangeNotificationsOptions"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static implicit operator ChangeNotificationsOptions(string value)
+            => new ChangeNotificationsOptions(value);
+
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="bool"/> to a <see cref="ChangeNotificationsOptions"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static implicit operator ChangeNotificationsOptions(bool value)
+            => new ChangeNotificationsOptions(value);
+
+        /// <summary>
+        /// Initializes a new instance of <c>ChangeNotificationsOptions</c> with the specified value.
+        /// </summary>
+        /// <param name="value"></param>
+        public ChangeNotificationsOptions(string value)
+        {
+            Type = typeof(string);
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <c>ChangeNotificationsOptions</c> with the specified value.
+        /// </summary>
+        /// <param name="value"></param>
+        public ChangeNotificationsOptions(bool value)
+        {
+            Type = typeof(bool);
+            Value = value;
+        }
+    }
+}

LanguageServer/Parameters/General/ColorProviderOptions.cs

@@ -0,0 +1,15 @@
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <remarks>
+    /// The original spec describes the intersection type
+    /// <c>(ColorProviderOptions &amp; TextDocumentRegistrationOptions &amp; StaticRegistrationOptions)</c>.
+    /// This implementation merges their types into this class.
+    /// </remarks>
+    /// <seealso>Spec 3.6.0</seealso>
+    public class ColorProviderOptions : ProviderOptions
+    {
+    }
+}

LanguageServer/Parameters/General/InitializeParams.cs

@@ -1,4 +1,5 @@
-using System;
+using LanguageServer.Parameters.Workspace;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -40,5 +41,16 @@ public class InitializeParams
         /// </value>
         /// <seealso cref="LanguageServer.Parameters.TraceKind"/>
         public string trace { get; set; }
+
+        /// <summary>
+        /// The workspace folders configured in the client when the server starts.
+        /// </summary>
+        /// <remarks>
+        /// This property is only available if the client supports workspace folders.
+        /// It can be <c>null</c> if the client supports workspace folders but none are
+        /// configured.
+        /// </remarks>
+        /// <seealso>Spec 3.6.0</seealso>
+        public WorkspaceFolder[] workspaceFolders { get; set; }
     }
 }

LanguageServer/Parameters/General/ProviderOptions.cs

@@ -0,0 +1,37 @@
+using LanguageServer.Parameters.Client;
+
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <remarks>
+    /// The original spec describes the intersection type
+    /// <c>(TextDocumentRegistrationOptions &amp; StaticRegistrationOptions)</c>.
+    /// This implementation merges their types into this class.
+    /// </remarks>
+    /// <seealso>Spec 3.6.0</seealso>
+    public class ProviderOptions
+    {
+        /// <summary>
+        /// A document selector to identify the scope of the registration. If set to null
+        /// the document selector provided on the client side will be used.
+        /// </summary>
+        /// <remarks>
+        /// Merged from <see cref="TextDocumentRegistrationOptions"/>.
+        /// </remarks>
+        /// <seealso>Spec 3.6.0</seealso>
+        public DocumentFilter[] documentSelector { get; set; }
+
+        /// <summary>
+        /// The id used to register the request. The id can be used to deregister
+        /// the request again.
+        /// </summary>
+        /// <remarks>
+        /// Merged from <c>StaticRegistrationOptions</c>.
+        /// </remarks>
+        /// <seealso cref="Registration.id"/>
+        /// <seealso>Spec 3.6.0</seealso>
+        public string id { get; set; }
+    }
+}

LanguageServer/Parameters/General/ProviderOptionsOrBoolean.cs

@@ -0,0 +1,78 @@
+using LanguageServer.Json;
+
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <remarks>
+    /// The original spec describes the union type of <c>boolean</c> or the intersection type
+    /// <c>(TextDocumentRegistrationOptions &amp; StaticRegistrationOptions)</c>.
+    /// This implementation defines <see cref="ProviderOptions"/> class instead of the intersection type.
+    /// </remarks>
+    /// <seealso>Spec 3.6.0</seealso>
+    public class ProviderOptionsOrBoolean : Either
+    {
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="ProviderOptions"/> to a <see cref="ProviderOptionsOrBoolean"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <seealso>Spec 3.6.0</seealso>
+        public static implicit operator ProviderOptionsOrBoolean(ProviderOptions value)
+            => new ProviderOptionsOrBoolean(value);
+
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="bool"/> to a <see cref="ProviderOptionsOrBoolean"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <seealso>Spec 3.6.0</seealso>
+        public static implicit operator ProviderOptionsOrBoolean(bool value)
+            => new ProviderOptionsOrBoolean(value);
+
+        /// <summary>
+        /// Initializes a new instance of <c>ProviderOptionsOrBoolean</c> with the specified value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <seealso>Spec 3.6.0</seealso>
+        public ProviderOptionsOrBoolean(ProviderOptions value)
+        {
+            Type = typeof(ProviderOptions);
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <c>ProviderOptionsOrBoolean</c> with the specified value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <seealso>Spec 3.6.0</seealso>
+        public ProviderOptionsOrBoolean(bool value)
+        {
+            Type = typeof(bool);
+            Value = value;
+        }
+
+        /// <summary>
+        /// Returns true if its underlying value is a <see cref="ProviderOptions"/>.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public bool IsProviderOptions => Type == typeof(ProviderOptions);
+
+        /// <summary>
+        /// Returns true if its underlying value is a <see cref="bool"/>.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public bool IsBoolean => Type == typeof(bool);
+
+        /// <summary>
+        /// Gets the value of the current object if its underlying value is a <see cref="ProviderOptions"/>.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public ProviderOptions ProviderOptions => GetValue<ProviderOptions>();
+
+        /// <summary>
+        /// Gets the value of the current object if its underlying value is a <see cref="bool"/>.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public bool Boolean => GetValue<bool>();
+    }
+}

LanguageServer/Parameters/General/ServerCapabilities.cs

@@ -41,6 +41,18 @@ public class ServerCapabilities
         /// </summary>
         public bool? definitionProvider { get; set; }
 
+        /// <summary>
+        /// The server provides Goto Type Definition support.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public ProviderOptionsOrBoolean typeDefinitionProvider { get; set; }
+
+        /// <summary>
+        /// The server provides Goto Implementation support.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public ProviderOptionsOrBoolean implementationProvider { get; set; }
+
         /// <summary>
         /// The server provides find references support.
         /// </summary>
@@ -105,11 +117,23 @@ public class ServerCapabilities
         /// </summary>
         public DocumentLinkOptions documentLinkProvider { get; set; }
 
+        /// <summary>
+        /// The server provides color provider support.
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public ColorProviderOptions colorProvider { get; set; }
+
         /// <summary>
         /// The server provides execute command support.
         /// </summary>
         public ExecuteCommandOptions executeCommandProvider { get; set; }
 
+        /// <summary>
+        /// Workspace specific server capabilities
+        /// </summary>
+        /// <seealso>Spec 3.6.0</seealso>
+        public WorkspaceOptions workspace { get; set; }
+
         /// <summary>
         /// Experimental server capabilities.
         /// </summary>

LanguageServer/Parameters/General/TextDocumentClientCapabilities.cs

@@ -65,6 +65,20 @@ public class TextDocumentClientCapabilities
         /// </summary>
         public RegistrationCapabilities definition { get; set; }
 
+        /// <summary>
+        /// Capabilities specific to the <c>textDocument/typeDefinition</c>
+        /// </summary>
+        /// <seealso cref="ProviderOptions"/>
+        /// <seealso>Spec 3.6.0</seealso>
+        public RegistrationCapabilities typeDefinition { get; set; }
+
+        /// <summary>
+        /// Capabilities specific to the <c>textDocument/implementation</c>.
+        /// </summary>
+        /// <seealso cref="ProviderOptions"/>
+        /// <seealso>Spec 3.6.0</seealso>
+        public RegistrationCapabilities implementation { get; set; }
+
         /// <summary>
         /// Capabilities specific to the <c>textDocument/codeAction</c>
         /// </summary>
@@ -80,6 +94,20 @@ public class TextDocumentClientCapabilities
         /// </summary>
         public RegistrationCapabilities documentLink { get; set; }
 
+        /// <summary>
+        /// Capabilities specific to the <c>textDocument/documentColor</c> and the
+        /// <c>textDocument/colorPresentation</c> request.
+        /// </summary>
+        /// <remarks>
+        /// <c>dynamicRegistration</c> property shows whether colorProvider supports dynamic registration.
+        /// If this is set to <c>true</c> the client supports the new
+        /// <c>(ColorProviderOptions &amp; TextDocumentRegistrationOptions &amp; StaticRegistrationOptions)</c>
+        /// return value for the corresponding server capability as well.
+        /// </remarks>
+        /// <seealso cref="ColorProviderOptions"/>
+        /// <seealso>Spec 3.6.0</seealso>
+        public RegistrationCapabilities colorProvider { get; set; }
+
         /// <summary>
         /// Capabilities specific to the <c>textDocument/rename</c>
         /// </summary>