Skip to content

Commit a2dd96e

Browse files
committed
Fix serialization of foldingRange capability to match spec
1 parent 25adbbf commit a2dd96e

7 files changed

+13
-12
lines changed

src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class TextDocumentClientCapabilities
109109
///
110110
/// Since 3.10.0
111111
/// </summary>
112-
public Supports<FoldingRangeCapability> FoldingRangeProvider { get; set; }
112+
public Supports<FoldingRangeCapability> FoldingRange { get; set; }
113113

114114
/// <summary>
115115
/// Capabilities specific to `textDocument/publishDiagnostics`.

src/Server/LanguageServer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
316316
ImplementationProvider = ccp.GetStaticOptions(textDocumentCapabilities.Implementation).Get<IImplementationOptions, ImplementationOptions>(ImplementationOptions.Of),
317317
TypeDefinitionProvider = ccp.GetStaticOptions(textDocumentCapabilities.TypeDefinition).Get<ITypeDefinitionOptions, TypeDefinitionOptions>(TypeDefinitionOptions.Of),
318318
ColorProvider = ccp.GetStaticOptions(textDocumentCapabilities.ColorProvider).Get<IColorOptions, ColorOptions>(ColorOptions.Of),
319-
FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRangeProvider).Get<IFoldingRangeOptions, FoldingRangeOptions>(FoldingRangeOptions.Of),
319+
FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRange).Get<IFoldingRangeOptions, FoldingRangeOptions>(FoldingRangeOptions.Of),
320320
};
321321

322322
if (_collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler)))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void SimpleTest(string expected)
6262
DidSave = true,
6363
WillSaveWaitUntil = true
6464
},
65-
FoldingRangeProvider = new FoldingRangeCapability() {
65+
FoldingRange = new FoldingRangeCapability() {
6666
DynamicRegistration = true,
6767
LineFoldingOnly = true,
6868
RangeLimit = 5000

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@
8888
"dynamicRegistration": true
8989
},
9090
"foldingRange": {
91-
"dynamicRegistration": true,
92-
"rangeLimit": 5000,
93-
"lineFoldingOnly": true
91+
"rangeLimit": 5000,
92+
"lineFoldingOnly": true,
93+
"dynamicRegistration": true
9494
}
9595
},
9696
"experimental": {

test/Lsp.Tests/FluentAssertionsExtensions.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public static EquivalencyAssertionOptions<T> ConfigureForSupports<T>(this Equiva
3737
.ComparingByMembers<Supports<DidChangeConfigurationCapability>>()
3838
.ComparingByMembers<Supports<DidChangeWatchedFilesCapability>>()
3939
.ComparingByMembers<Supports<WorkspaceSymbolCapability>>()
40-
.ComparingByMembers<Supports<ExecuteCommandCapability>>();
40+
.ComparingByMembers<Supports<ExecuteCommandCapability>>()
41+
.ComparingByMembers<Supports<FoldingRangeCapability>>();
4142
}
4243
}
4344
}

test/Lsp.Tests/Models/InitializeParamsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public void SimpleTest(string expected)
5151
DidSave = true,
5252
WillSaveWaitUntil = true
5353
},
54-
FoldingRangeProvider = new FoldingRangeCapability {
54+
FoldingRange = new FoldingRangeCapability {
5555
DynamicRegistration = true,
5656
LineFoldingOnly = true,
57-
RangeLimit = 500,
57+
RangeLimit = 5000,
5858
}
5959
},
6060
Workspace = new WorkspaceClientCapabilities() {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
"dynamicRegistration": true
7979
},
8080
"foldingRange": {
81-
"dynamicRegistration": true,
8281
"rangeLimit": 5000,
83-
"lineFoldingOnly": true
84-
},
82+
"lineFoldingOnly": true,
83+
"dynamicRegistration": true
84+
}
8585
},
8686
"experimental": {
8787
"abc": "test"

0 commit comments

Comments
 (0)