more wip on latest spec

Author: david-driscoll

LanguageServer/Protocol/Document/Server/IFoldingRangeHandler.cs

@@ -6,6 +6,6 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
 {
     using static DocumentNames;
-    [Serial, Method(FoldingRange)]
+    [Parallel, Method(FoldingRange)]
     public interface IFoldingRangeHandler : IJsonRpcRequestHandler<FoldingRangeRequestParam, Container<FoldingRange>>, IRegistration<TextDocumentRegistrationOptions>, ICapability<FoldingRangeCapability> { }
 }

language-server-protocol.sha.txt

@@ -1,2 +1,2 @@
 -- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol
-05e3af34464671a788679080f06558db52d1097b
+f39afb47038be65431ec684dc11725ff74e71f48

src/Protocol/Client/Capabilities/ColorProviderCapability.cs

@@ -2,5 +2,20 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class ColorProviderCapability : DynamicCapability, ConnectedCapability<IDocumentColorHandler>, ConnectedCapability<IColorPresentationHandler> {}
+    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/DocumentSymbolCapability.cs

@@ -3,12 +3,19 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability<IDocumentSymbolHandler> {
+    public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability<IDocumentSymbolHandler>
+    {
 
         /// <summary>
         /// Specific capabilities for the `SymbolKind` in the `textDocument/symbol` request.
         /// </summary>
         [Optional]
         public SymbolKindCapability SymbolKind { get; set; }
+
+        /// <summary>
+		/// Whether document symbol supports hierarchical `DocumentSymbol`s.
+        /// </summary>
+        [Optional]
+        public bool? hierarchicalDocumentSymbolSupport { get; set; }
     }
 }

src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

@@ -99,6 +99,13 @@ public class TextDocumentClientCapabilities
         /// </summary>
         public Supports<ColorProviderCapability> ColorProvider { get; set; }
 
+        /// <summary>
+        /// The server provides folding provider support.
+        ///
+        /// Since 3.10.0
+        /// </summary>
+        public Supports<FoldingRangeProviderCapability> FoldingRangeProvider { get; set; }
+
         /// <summary>
         /// Capabilities specific to `textDocument/publishDiagnostics`.
         /// </summary>

src/Protocol/DocumentNames.cs

@@ -30,5 +30,6 @@ public static class DocumentNames
         public const string WillSave = "textDocument/willSave";
         public const string WillSaveWaitUntil = "textDocument/willSaveWaitUntil";
         public const string PublishDiagnostics = "textDocument/publishDiagnostics";
+        public const string FoldingRange = "textDocument/foldingRange";
     }
 }

src/Protocol/Models/TextDocumentRegistrationOptions.cs

@@ -11,4 +11,8 @@ public class TextDocumentRegistrationOptions : ITextDocumentRegistrationOptions
         /// </summary>
         public DocumentSelector DocumentSelector { get; set; } = new DocumentSelector();
     }
+
+    public class CodeActionRegistrationOptions  : TextDocumentRegistrationOptions, ICodeActionOptions  {
+
+    }
 }

src/Protocol/Server/Capabilities/ServerCapabilities.cs

@@ -126,6 +126,13 @@ public class ServerCapabilities
         /// </summary>
         [Optional]
         public BooleanOr<StaticColorOptions> ColorProvider { get; set; }
+
+        /// <summary>
+        /// The server provides folding provider support.
+        ///
+        /// Since 3.10.0
+        /// </summary>
+        public BooleanOr<StaticFoldingRangeOptions> FoldingRangeProvider { get; set; }
         /// <summary>
         /// Workspace specific server capabilities
         /// </summary>
@@ -142,6 +149,6 @@ public class CodeActionOptions
         /// may list out every specific kind they provide.
         /// </summary>
         [Optional]
-        public Container<CodeActionKind> ProvidedCodeActionKinds { get; set; }
+        public Container<CodeActionKind> CodeActionKinds { get; set; }
     }
 }

src/Server/LanguageServer.cs

@@ -293,6 +293,7 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
                 ImplementationProvider = ccp.GetStaticOptions(textDocumentCapabilities.Implementation).Get<IImplementationOptions, ImplementationOptions>(ImplementationOptions.Of),
                 TypeDefinitionProvider = ccp.GetStaticOptions(textDocumentCapabilities.TypeDefinition).Get<ITypeDefinitionOptions, TypeDefinitionOptions>(TypeDefinitionOptions.Of),
                 ColorProvider = ccp.GetStaticOptions(textDocumentCapabilities.ColorProvider).Get<IColorOptions, StaticColorOptions>(ColorOptions.Of),
+                FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRangeProvider).Get<IColorOptions, StaticFoldingRangeOptions>(FoldingRangeOptions.Of),
             };
 
             if (_collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler)))