Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of textDocument/foldingRange #143

Merged
merged 2 commits into from
Jun 12, 2019
Merged

Fix handling of textDocument/foldingRange #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25adbbf
Add tests showing wrong handling of textDocument/foldingRange
fgreinacher May 24, 2019
a2dd96e
Fix serialization of foldingRange capability to match spec
fgreinacher May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public class TextDocumentClientCapabilities
///
/// Since 3.10.0
/// </summary>
public Supports<FoldingRangeCapability> FoldingRangeProvider { get; set; }
public Supports<FoldingRangeCapability> FoldingRange { get; set; }
fgreinacher marked this conversation as resolved.
Show resolved Hide resolved

/// <summary>
/// Capabilities specific to `textDocument/publishDiagnostics`.
Expand Down
2 changes: 1 addition & 1 deletion src/Server/LanguageServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
6 changes: 6 additions & 0 deletions test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests_$SimpleTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@
"implementation": {
"linkSupport": true,
"dynamicRegistration": true
},
"foldingRange": {
"rangeLimit": 5000,
"lineFoldingOnly": true,
"dynamicRegistration": true
}
},
"experimental": {
Expand Down
3 changes: 2 additions & 1 deletion test/Lsp.Tests/FluentAssertionsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>();
}
}
}
5 changes: 5 additions & 0 deletions test/Lsp.Tests/Models/InitializeParamsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
5 changes: 5 additions & 0 deletions test/Lsp.Tests/Models/InitializeParamsTests_$SimpleTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@
"rename": {
"prepareSupport": false,
"dynamicRegistration": true
},
"foldingRange": {
"rangeLimit": 5000,
"lineFoldingOnly": true,
"dynamicRegistration": true
}
},
"experimental": {
Expand Down