Merge pull request #143 from fgreinacher/fix/folding-range-serialization

Fix handling of textDocument/foldingRange

Author: david-driscoll

src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

@@ -109,7 +109,7 @@ public class TextDocumentClientCapabilities
         ///
         /// Since 3.10.0
         /// </summary>
-        public Supports<FoldingRangeCapability> FoldingRangeProvider { get; set; }
+        public Supports<FoldingRangeCapability> FoldingRange { get; set; }
 
         /// <summary>
         /// Capabilities specific to `textDocument/publishDiagnostics`.

src/Server/LanguageServer.cs

@@ -316,7 +316,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, ColorOptions>(ColorOptions.Of),
-                FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRangeProvider).Get<IFoldingRangeOptions, FoldingRangeOptions>(FoldingRangeOptions.Of),
+                FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRange).Get<IFoldingRangeOptions, FoldingRangeOptions>(FoldingRangeOptions.Of),
             };
 
             if (_collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler)))

test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs

@@ -61,7 +61,13 @@ public void SimpleTest(string expected)
                         WillSave = true,
                         DidSave = true,
                         WillSaveWaitUntil = true
+                    },
+                    FoldingRange = new FoldingRangeCapability() {
+                        DynamicRegistration = true,
+                        LineFoldingOnly = true,
+                        RangeLimit = 5000
                     }
+                    
                 },
                 Workspace = new WorkspaceClientCapabilities() {
                     ApplyEdit = true,

test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests_$SimpleTest.json

@@ -86,6 +86,11 @@
         "implementation": {
             "linkSupport": true,
             "dynamicRegistration": true
+        },
+        "foldingRange": {
+            "rangeLimit": 5000,
+            "lineFoldingOnly": true,
+            "dynamicRegistration": true
         }
     },
     "experimental": {

test/Lsp.Tests/FluentAssertionsExtensions.cs

@@ -37,7 +37,8 @@ public static EquivalencyAssertionOptions<T> ConfigureForSupports<T>(this Equiva
                 .ComparingByMembers<Supports<DidChangeConfigurationCapability>>()
                 .ComparingByMembers<Supports<DidChangeWatchedFilesCapability>>()
                 .ComparingByMembers<Supports<WorkspaceSymbolCapability>>()
-                .ComparingByMembers<Supports<ExecuteCommandCapability>>();
+                .ComparingByMembers<Supports<ExecuteCommandCapability>>()
+                .ComparingByMembers<Supports<FoldingRangeCapability>>();
         }
     }
 }

test/Lsp.Tests/Models/InitializeParamsTests.cs

@@ -50,6 +50,11 @@ public void SimpleTest(string expected)
                             WillSave = true,
                             DidSave = true,
                             WillSaveWaitUntil = true
+                        },
+                        FoldingRange = new FoldingRangeCapability {
+                            DynamicRegistration = true,
+                            LineFoldingOnly = true,
+                            RangeLimit = 5000,
                         }
                     },
                     Workspace = new WorkspaceClientCapabilities() {

test/Lsp.Tests/Models/InitializeParamsTests_$SimpleTest.json

@@ -76,6 +76,11 @@
             "rename": {
                 "prepareSupport": false,
                 "dynamicRegistration": true
+            },
+            "foldingRange": {
+                "rangeLimit": 5000,
+                "lineFoldingOnly": true,
+                "dynamicRegistration": true
             }
         },
         "experimental": {