Added prepare rename, and fixed build. Tests wip

Author: david-driscoll

LanguageServer/Protocol/Server/Capabilities/FoldingRangeProviderOptions.cs

@@ -1,2 +1,2 @@
 -- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages
-f39afb47038be65431ec684dc11725ff74e71f48
+9e2713d5f1618b8d5e05a91a4e2c637aa51e1ee0

language-server-protocol.sha.txt

@@ -2,8 +2,8 @@
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))" />
     <PropertyGroup>
         <PackageVersion Condition="'$(GitVersion_NuGetVersion)' != ''">$(GitVersion_NuGetVersion)</PackageVersion>
+        <AssemblyVersion>0.0.9.9</AssemblyVersion>
         <AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_Major).$(GitVersion_Minor).0.0</AssemblyVersion>
-        <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">0.0.9.9</AssemblyVersion>
         <FileVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</FileVersion>
         <InformationalVersion Condition="'$(GitVersion_InformationalVersion)' != ''">$(GitVersion_InformationalVersion)</InformationalVersion>
         <IsPackable>true</IsPackable>

src/Directory.Build.props

@@ -1,3 +1,4 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
@@ -11,104 +12,6 @@ public class CodeActionCapability : DynamicCapability, ConnectedCapability<ICode
         /// Since 3.8.0
         /// </summary>
         [Optional]
-        public CodeActionLiteralSupportCapability codeActionLiteralSupport { get; set; }
-    }
-
-    public class CodeActionLiteralSupportCapability
-    {
-
-        /// <summary>
-        /// The code action kind is support with the following value
-        /// set.
-        /// </summary>
-
-        public CodeActionKindCapability CodeActionKind { get; set; }
-    }
-
-    public class CodeActionKindCapability
-    {
-        /// <summary>
-        /// The code action kind values the client supports. 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.
-        /// </summary>
-        public Container<CodeActionKind> ValueSet { get; set; }
-    }
-
-    /// <summary>
-    /// A set of predefined code action kinds
-    /// </summary>
-    [JsonConverter(typeof(CodeActionKindConverter))]
-    public class CodeActionKind
-    {
-        /// <summary>
-        /// Base kind for quickfix actions: 'quickfix'
-        /// </summary>
-        public static CodeActionKind QuickFix = new CodeActionKind("quickfix");
-
-        /// <summary>
-        /// Base kind for refactoring actions: 'refactor'
-        /// </summary>
-        public static CodeActionKind Refactor = new CodeActionKind("refactor");
-
-        /// <summary>
-        /// Base kind for refactoring extraction actions: 'refactor.extract'
-        ///
-        /// Example extract actions:
-        ///
-        /// - Extract method
-        /// - Extract function
-        /// - Extract variable
-        /// - Extract interface from class
-        /// - ...
-        /// </summary>
-        public static CodeActionKind RefactorExtract = new CodeActionKind("refactor.extract");
-
-        /// <summary>
-        /// Base kind for refactoring inline actions: 'refactor.inline'
-        ///
-        /// Example inline actions:
-        ///
-        /// - Inline function
-        /// - Inline variable
-        /// - Inline constant
-        /// - ...
-        /// </summary>
-        public static CodeActionKind RefactorInline = new CodeActionKind("refactor.inline");
-
-        /// <summary>
-        /// Base kind for refactoring rewrite actions: 'refactor.rewrite'
-        ///
-        /// Example rewrite actions:
-        ///
-        /// - Convert JavaScript function to class
-        /// - Add or remove parameter
-        /// - Encapsulate field
-        /// - Make method static
-        /// - Move method to base class
-        /// - ...
-        /// </summary>
-        public static CodeActionKind RefactorRewrite = new CodeActionKind("refactor.rewrite");
-
-        /// <summary>
-        /// Base kind for source actions: `source`
-        ///
-        /// Source code actions apply to the entire file.
-        /// </summary>
-        public static CodeActionKind Source = new CodeActionKind("source");
-
-        /// <summary>
-        /// Base kind for an organize imports source action: `source.organizeImports`
-        /// </summary>
-        public static CodeActionKind SourceOrganizeImports = new CodeActionKind("source.organizeImports");
-
-        public CodeActionKind(string kind)
-        {
-            kind = kind;
-        }
-
-        public string Kind { get; }
-
+        public CodeActionLiteralSupportCapability CodeActionLiteralSupport { get; set; }
     }
 }

src/Protocol/Client/Capabilities/CodeActionCapability.cs

@@ -0,0 +1,15 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    public class CodeActionKindCapability
+    {
+        /// <summary>
+        /// The code action kind values the client supports. 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.
+        /// </summary>
+        public Container<CodeActionKind> ValueSet { get; set; }
+    }
+}

src/Protocol/Client/Capabilities/CodeActionKindCapability.cs

@@ -0,0 +1,13 @@
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    public class CodeActionLiteralSupportCapability
+    {
+
+        /// <summary>
+        /// The code action kind is support with the following value
+        /// set.
+        /// </summary>
+
+        public CodeActionKindCapability CodeActionKind { get; set; }
+    }
+}

src/Protocol/Client/Capabilities/CodeActionLiteralSupportCapability.cs

@@ -3,19 +3,4 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
     public class ColorProviderCapability : DynamicCapability, ConnectedCapability<IDocumentColorHandler>, ConnectedCapability<IColorPresentationHandler> { }
-    public class FoldingRangeCapability : DynamicCapability, ConnectedCapability<IFoldingRangeHandler>, ConnectedCapability<IFoldingRangeHandler>
-    {
-        /// <summary>
-        /// The maximum number of folding ranges that the client prefers to receive per document. The value serves as a
-        /// hint, servers are free to follow the limit.
-        /// </summary>
-        [Optional]
-        public int? RangeLimit { get; set; }
-
-        /// <summary>
-        /// If set, the client signals that it only supports folding complete lines. If set, client will
-        /// ignore specified `startCharacter` and `endCharacter` properties in a FoldingRange.
-        /// </summary>
-        public bool LineFoldingOnly { get; set; }
-    }
 }

src/Protocol/Client/Capabilities/ColorProviderCapability.cs

@@ -16,6 +16,6 @@ public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability<I
 		/// Whether document symbol supports hierarchical `DocumentSymbol`s.
         /// </summary>
         [Optional]
-        public bool? hierarchicalDocumentSymbolSupport { get; set; }
+        public bool? HierarchicalDocumentSymbolSupport { get; set; }
     }
 }

src/Protocol/Client/Capabilities/DocumentSymbolCapability.cs

@@ -1,21 +1,21 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class FoldingRangeCapability : DynamicCapability
+    public class FoldingRangeCapability : DynamicCapability, ConnectedCapability<IFoldingRangeHandler>
     {
         /// <summary>
         /// The maximum number of folding ranges that the client prefers to receive per document. The value serves as a
         /// hint, servers are free to follow the limit.
         /// </summary>
         [Optional]
-        public long? RangeLimit { get; set; }
+        public int? RangeLimit { get; set; }
 
         /// <summary>
-        ///  set, the client signals that it only supports folding complete lines. If set, client will
+        /// If set, the client signals that it only supports folding complete lines. If set, client will
         /// ignore specified `startCharacter` and `endCharacter` properties in a FoldingRange.
         /// </summary>
-        [Optional]
         public bool LineFoldingOnly { get; set; }
     }
 }

LanguageServer/Protocol/Client/Capabilities/FoldingRangeCapability.cs renamed to src/Protocol/Client/Capabilities/FoldingRangeCapability.cs

@@ -1,6 +1,15 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler> { }
+    public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler>, ConnectedCapability<IPrepareRenameHandler>
+    {
+        /// <summary>
+        /// Client supports testing for validity of rename operations
+        /// before execution.
+        /// </summary>
+        [Optional]
+        public bool PrepareSupport { get; set; }
+    }
 }