Fix folding range bug in C# extension (#69817)

* fix folding range bug * feedback * folding range works for regions now
dotnet · Sep 13, 2023 · 0d61377 · 0d61377
1 parent 54a85bc
commit 0d61377
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Features/LanguageServer/Protocol/Handler/FoldingRanges/FoldingRangesHandler.cs b/src/Features/LanguageServer/Protocol/Handler/FoldingRanges/FoldingRangesHandler.cs
@@ -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);
         }
 

diff --git a/src/Features/LanguageServer/ProtocolUnitTests/FoldingRanges/FoldingRangesTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/FoldingRanges/FoldingRangesTests.cs
@@ -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 =