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

Jump to bottom

Fix folding range bug in C# extension #69817

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Fix folding range bug in C# extension #69817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7bdd19
fix folding range bug
akhera99 Sep 5, 2023
1b5a42e
feedback
akhera99 Sep 7, 2023
be76882
folding range works for regions now
akhera99 Sep 13, 2023
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
10 changes: 9 additions & 1 deletion src/Features/LanguageServer/Protocol/Handler/FoldingRanges/FoldingRangesHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,15 @@ public FoldingRangesHandler(IGlobalOptionService globalOptions)
if (document is null)
return null;

var options = _globalOptions.GetBlockStructureOptions(document.Project);
var options = _globalOptions.GetBlockStructureOptions(document.Project) with
{
// Need to set the block structure guide options to true since the concept does not exist in vscode
// but we still want to categorize them as the correct BlockType.
ShowBlockStructureGuidesForCommentsAndPreprocessorRegions = true,
ShowBlockStructureGuidesForDeclarationLevelConstructs = true,
ShowBlockStructureGuidesForCodeLevelConstructs = true
};

return await GetFoldingRangesAsync(document, options, cancellationToken).ConfigureAwait(false);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Features/LanguageServer/ProtocolUnitTests/FoldingRanges/FoldingRangesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public async Task TestGetFoldingRangeAsync_Comments(bool mutatingLspWorkspace)
AssertJsonEquals(expected, results);
}

[Theory(Skip = "GetFoldingRangeAsync does not yet support regions."), CombinatorialData]
[Theory, CombinatorialData]
public async Task TestGetFoldingRangeAsync_Regions(bool mutatingLspWorkspace)
{
var markup =
Expand Down