Merge branch 'feature/v3_8_0'

Author: matarillo

LanguageServer/Infrastructure/JsonDotNet/EitherConverter.cs

@@ -26,8 +26,10 @@ public EitherConverter()
             table[typeof(NumberOrString)] = token => (object)ToNumberOrString(token);
             table[typeof(LocationSingleOrArray)] = token => (object)ToLocationSingleOrArray(token);
             table[typeof(ChangeNotificationsOptions)] = token => (object)ToChangeNotificationsOptions(token);
+            table[typeof(ColorProviderOptionsOrBoolean)] = token => (object)ToColorProviderOptionsOrBoolean(token);
             table[typeof(ProviderOptionsOrBoolean)] = token => (object)ToProviderOptionsOrBoolean(token);
             table[typeof(TextDocumentSync)] = token => (object)ToTextDocumentSync(token);
+            table[typeof(CodeActionResult)] = token => (object)ToCodeActionResult(token);
             table[typeof(Documentation)] = token => (object)ToDocumentation(token);
             table[typeof(CompletionResult)] = token => (object)ToCompletionResult(token);
             table[typeof(HoverContents)] = token => (object)ToHoverContents(token);
@@ -106,6 +108,21 @@ private ChangeNotificationsOptions ToChangeNotificationsOptions(JToken token)
             }
         }
 
+        private ColorProviderOptionsOrBoolean ToColorProviderOptionsOrBoolean(JToken token)
+        {
+            switch (token.Type)
+            {
+                case JTokenType.Null:
+                    return null;
+                case JTokenType.Boolean:
+                    return new ColorProviderOptionsOrBoolean(token.ToObject<bool>());
+                case JTokenType.Object:
+                    return new ColorProviderOptionsOrBoolean(token.ToObject<ColorProviderOptions>());
+                default:
+                    throw new JsonSerializationException();
+            }
+        }
+
         private ProviderOptionsOrBoolean ToProviderOptionsOrBoolean(JToken token)
         {
             switch (token.Type)
@@ -136,6 +153,43 @@ private TextDocumentSync ToTextDocumentSync(JToken token)
             }
         }
 
+        private CodeActionResult ToCodeActionResult(JToken token)
+        {
+            switch (token.Type)
+            {
+                case JTokenType.Null:
+                    return null;
+                case JTokenType.Array:
+                    var array = (JArray) token;
+                    if (array.Count == 0)
+                    {
+                        return new CodeActionResult(new Command[0]);
+                    }
+
+                    var element = (array[0] as JObject) ?? throw new JsonSerializationException();
+                    if (element.Property("edit") != null)
+                    {
+                        return new CodeActionResult(array.ToObject<CodeAction[]>());
+                    }
+
+                    var command = element.Property("command") ?? throw new JsonSerializationException();
+                    if (command.Type == JTokenType.Object)
+                    {
+                        return new CodeActionResult(array.ToObject<CodeAction[]>());
+                    }
+                    else if (command.Type == JTokenType.String)
+                    {
+                        return new CodeActionResult(array.ToObject<Command[]>());
+                    }
+                    else
+                    {
+                        throw new JsonSerializationException();
+                    }
+                default:
+                    throw new JsonSerializationException();
+            }
+        }
+
         private Documentation ToDocumentation(JToken token)
         {
             switch (token.Type)

LanguageServer/Json/Either.cs

@@ -11,7 +11,7 @@ namespace LanguageServer.Json
     /// <item><description><see cref="NumberOrString"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.LocationSingleOrArray"/></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.ColorProviderOptionsOrBoolean"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.General.FoldingRangeProviderCapabilities"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.General.ProviderOptionsOrBoolean"/></description></item>
     /// <item><description><see cref="LanguageServer.Parameters.General.TextDocumentSync"/></description></item>

LanguageServer/Parameters/CodeActionKind.cs

@@ -0,0 +1,86 @@
+namespace LanguageServer.Parameters
+{
+    /// <summery>
+    /// A set of predefined code action kinds
+    /// </summery>
+    /// <seealso cref="LanguageServer.Parameters.General.CodeActionKindCapabilities.valueSet"/>
+    /// <seealso cref="LanguageServer.Parameters.TextDocument.CodeActionContext.only"/>
+    /// <seealso>Spec 3.8.0</seealso>
+    public static class CodeActionKind
+    {
+        /// <summary>
+        /// Base kind for quickfix actions: 'quickfix'
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string QuickFix = "quickfix";
+
+        /// <summary>
+        /// Base kind for refactoring actions: 'refactor'
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string Refactor = "refactor";
+
+        /// <summary>
+        /// Base kind for refactoring extraction actions: 'refactor.extract'
+        /// </summary>
+        /// <example>
+        /// Example extract actions:
+        /// <list type="bullet">
+        /// <item><description>Extract method</description></item>
+        /// <item><description>Extract function</description></item>
+        /// <item><description>Extract variable</description></item>
+        /// <item><description>Extract interface from class</description></item>
+        /// <item><description>...</description></item>
+        /// </list>
+        /// </example>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string RefactorExtract = "refactor.extract";
+
+        /// <summary>
+        /// Base kind for refactoring inline actions: 'refactor.inline'
+        /// </summary>
+        /// <example>
+        /// Example inline actions:
+        /// <list type="bullet">
+        /// <item><description>Inline function</description></item>
+        /// <item><description>Inline variable</description></item>
+        /// <item><description>Inline constant</description></item>
+        /// <item><description>...</description></item>
+        /// </list>
+        /// </example>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string RefactorInline = "refactor.inline";
+
+        /// <summary>
+        /// Base kind for refactoring rewrite actions: 'refactor.rewrite'
+        /// </summary>
+        /// <example>
+        /// Example rewrite actions:
+        /// <list type="bullet">
+        /// <item><description>Convert JavaScript function to class</description></item>
+        /// <item><description>Add or remove parameter</description></item>
+        /// <item><description>Encapsulate field</description></item>
+        /// <item><description>Make method static</description></item>
+        /// <item><description>Move method to base class</description></item>
+        /// <item><description>...</description></item>
+        /// </list>
+        /// </example>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string RefactorRewrite = "refactor.rewrite";
+
+        /// <summary>
+        /// Base kind for source actions: 'source'
+        /// </summary>
+        /// <remarks>
+        /// Source code actions apply to the entire file.
+        /// </remarks>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string Source = "source";
+
+        /// <summary>
+        /// Base kind for an organize imports source action: 'source.organizeImports'
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public const string SourceOrganizeImports = "source.organizeImports";
+    }
+}

LanguageServer/Parameters/General/CodeActionCapabilities.cs

@@ -0,0 +1,16 @@
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <seealso>Spec 3.8.0</seealso>
+    public class CodeActionCapabilities : RegistrationCapabilities
+    {
+        /// <summary>
+        /// The client support code action literals as a valid
+        /// response of the `textDocument/codeAction` request.
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public CodeActionLiteralSupportCapabilities codeActionLiteralSupport { get; set; }
+    }
+}

LanguageServer/Parameters/General/CodeActionKindCapabilities.cs

@@ -0,0 +1,24 @@
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <seealso>Spec 3.8.0</seealso>
+    public class CodeActionKindCapabilities
+    {
+        /// <summary>
+        /// The code action kind values the client supports.
+        /// </summary>
+        /// <remarks>
+        /// When this property exists the client also guarantees that it will
+        /// handle values outside its set gracefully and falls back
+        /// to a default value when unknown.
+        /// </remarks>
+        /// <value>
+        /// See <see cref="LanguageServer.Parameters.CodeActionKind"/> for an enumeration of standardized kinds.
+        /// </value>
+        /// <seealso>Spec 3.8.0</seealso>
+        /// <seealso cref="LanguageServer.Parameters.CodeActionKind"/>
+        public string[] valueSet { get; set; }
+    }
+}

LanguageServer/Parameters/General/CodeActionLiteralSupportCapabilities.cs

@@ -0,0 +1,15 @@
+namespace LanguageServer.Parameters.General
+{
+    /// <summary>
+    /// For <c>initialize</c>
+    /// </summary>
+    /// <seealso>Spec 3.8.0</seealso>
+    public class CodeActionLiteralSupportCapabilities
+    {
+        /// <summary>
+        /// The code action kind is support with the following value set.
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public CodeActionKindCapabilities codeActionKind { get; set; }
+    }
+}

LanguageServer/Parameters/General/ColorProviderOptionsOrBoolean.cs

@@ -0,0 +1,81 @@
+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>, <c>ColorProviderOptions</c>, or the intersection type
+    /// <c>(ColorProviderOptions &amp; TextDocumentRegistrationOptions &amp; StaticRegistrationOptions)</c>.
+    /// This implementation defines <see cref="ColorProviderOptions"/> class instead of the intersection type.
+    /// </remarks>
+    /// <seealso>Spec 3.8.0</seealso>
+    public class ColorProviderOptionsOrBoolean : Either
+    {
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="ColorProviderOptions"/> to a <see cref="ColorProviderOptionsOrBoolean"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <seealso>Spec 3.8.0</seealso>
+        public static implicit operator ColorProviderOptionsOrBoolean(ColorProviderOptions value)
+            => new ColorProviderOptionsOrBoolean(value);
+
+        /// <summary>
+        /// Defines an implicit conversion of a <see cref="bool"/> to a <see cref="ColorProviderOptionsOrBoolean"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <seealso>Spec 3.8.0</seealso>
+        public static implicit operator ColorProviderOptionsOrBoolean(bool value)
+            => new ColorProviderOptionsOrBoolean(value);
+
+        /// <summary>
+        /// Initializes a new instance of <c>ColorProviderOptionsOrBoolean</c> with the specified value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <seealso>Spec 3.8.0</seealso>
+        public ColorProviderOptionsOrBoolean(ColorProviderOptions value)
+        {
+            Type = typeof(ColorProviderOptions);
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <c>ColorProviderOptionsOrBoolean</c> with the specified value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <seealso>Spec 3.8.0</seealso>
+        public ColorProviderOptionsOrBoolean(bool value)
+        {
+            Type = typeof(bool);
+            Value = value;
+        }
+
+        /// <summary>
+        /// Returns true if its underlying value is a <see cref="ColorProviderOptions"/>.
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public bool IsColorProviderOptions => Type == typeof(ColorProviderOptions);
+
+        /// <summary>
+        /// Returns true if its underlying value is a <see cref="bool"/>.
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public bool IsBoolean => Type == typeof(bool);
+
+        /// <summary>
+        /// Gets the value of the current object if its underlying value is a <see cref="ColorProviderOptions"/>.
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public ColorProviderOptions ColorProviderOptions => GetValue<ColorProviderOptions>();
+
+        /// <summary>
+        /// Gets the value of the current object if its underlying value is a <see cref="bool"/>.
+        /// </summary>
+        /// <seealso>Spec 3.8.0</seealso>
+        public bool Boolean => GetValue<bool>();
+    }
+}

LanguageServer/Parameters/General/ServerCapabilities.cs

@@ -5,6 +5,7 @@ namespace LanguageServer.Parameters.General
     /// <summary>
     /// For <c>initialize</c>
     /// </summary>
+    /// <seealso>Spec 3.8.0</seealso>
     public class ServerCapabilities
     {
         /// <summary>
@@ -77,7 +78,7 @@ public class ServerCapabilities
         /// The server provides code actions.
         /// </summary>
         /// <remarks>
-        /// The <c>CodeActionOptions</c> return type is only
+        /// The <c>CodeActionOptions</c> return type (since version 3.11.0) is only
         /// valid if the client signals code action literal support via the property
         /// <c>textDocument.codeAction.codeActionLiteralSupport</c>.
         /// </remarks>
@@ -120,8 +121,8 @@ public class ServerCapabilities
         /// <summary>
         /// The server provides color provider support.
         /// </summary>
-        /// <seealso>Spec 3.6.0</seealso>
-        public ColorProviderOptions colorProvider { get; set; }
+        /// <seealso>Spec 3.8.0</seealso>
+        public ColorProviderOptionsOrBoolean colorProvider { get; set; }
 
         /// <summary>
         /// The server provides execute command support.

LanguageServer/Parameters/General/TextDocumentClientCapabilities.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// For <c>initialize</c>
     /// </summary>
-    /// <seealso>Spec 3.7.0</seealso>
+    /// <seealso>Spec 3.8.0</seealso>
     public class TextDocumentClientCapabilities
     {
         /// <summary>
@@ -80,9 +80,10 @@ public class TextDocumentClientCapabilities
         public RegistrationCapabilities implementation { get; set; }
 
         /// <summary>
-        /// Capabilities specific to the <c>textDocument/codeAction</c>
+        /// Capabilities specific to the <c>textDocument/codeAction</c>.
         /// </summary>
-        public RegistrationCapabilities codeAction { get; set; }
+        /// <seealso>Spec 3.8.0</seealso>
+        public CodeActionCapabilities codeAction { get; set; }
 
         /// <summary>
         /// Capabilities specific to the <c>textDocument/codeLens</c>