Merge pull request #75515 from Cosifne/dev/shech/FixCollapseToDefinition

Also compare other properties when remove block spans

src/EditorFeatures/Test/Structure/StructureTaggerTests.cs

@@ -359,6 +359,39 @@ End Sub
         });
     }
 
+    [WpfFact, WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2112145")]
+    public async Task LambdaShouldBeCollapsed()
+    {
+        var code = """
+            public class MyClass
+            {
+                public void MyMethod() => System.Linq.Enumerable.Range(10, 100).Any(x =>
+                {
+                    return x == 10;
+                });
+            }
+            """;
+
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        var tags = await GetTagsFromWorkspaceAsync(workspace);
+
+        Assert.Collection(tags, programTag =>
+        {
+            Assert.Equal("public class MyClass", GetHeaderText(programTag));
+            Assert.Equal(7, GetCollapsedHintLineCount(programTag));
+        },
+        mainTag =>
+        {
+            Assert.Equal("public void MyMethod()", GetHeaderText(mainTag));
+            Assert.Equal(4, GetCollapsedHintLineCount(mainTag));
+        },
+        IfTag =>
+        {
+            Assert.Equal("x =>", GetHeaderText(IfTag));
+            Assert.Equal(4, GetCollapsedHintLineCount(IfTag));
+        });
+    }
+
 #pragma warning disable CS0618 // Type or member is obsolete
     private static async Task<List<IContainerStructureTag>> GetTagsFromWorkspaceAsync(EditorTestWorkspace workspace)
     {

src/Features/Core/Portable/Structure/BlockSpan.cs

@@ -114,4 +114,30 @@ internal BlockSpan With(
         return new BlockSpan(
             newType, newIsCollapsible, newTextSpan, newHintSpan, newPrimarySpans, newBannerText, newAutoCollapse, newIsDefaultCollapsed);
     }
+
+    internal bool IsOverlappingBlockSpan(TextLineCollection lines, BlockSpan? other)
+    {
+        // Compare collapse region related properties to decide should two block span be consider as one.
+        // We only want one block span (inner block) for case like:
+        // M1(M2(
+        // ))
+        if (other is null)
+            return false;
+
+        if (this.AutoCollapse != other.Value.AutoCollapse
+            || this.IsCollapsible != other.Value.IsCollapsible
+            || this.IsDefaultCollapsed != other.Value.IsDefaultCollapsed)
+        {
+            return false;
+        }
+
+        var startLine = lines.GetLinePosition(this.TextSpan.Start).Line;
+        var otherStartLine = lines.GetLinePosition(other.Value.TextSpan.Start).Line;
+        if (startLine != otherStartLine)
+            return false;
+
+        var endLine = lines.GetLinePosition(this.TextSpan.End).Line;
+        var otherEndLine = lines.GetLinePosition(other.Value.TextSpan.End).Line;
+        return endLine == otherEndLine;
+    }
 }

src/Features/Core/Portable/Structure/Syntax/AbstractBlockStructureProvider.cs

@@ -49,24 +49,19 @@ public override void ProvideBlockStructure(in BlockStructureContext context)
             //
             // We only collapse the "inner" span which has larger start.
             context.Spans.Sort(initialContextCount, s_blockSpanComparer);
-
-            var lastAddedLineStart = -1;
-            var lastAddedLineEnd = -1;
             var text = context.SyntaxTree.GetText(context.CancellationToken);
+            BlockSpan? lastSpan = null;
+
             context.Spans.RemoveWhere((span, index, _) =>
                 {
                     // do not remove items before the first item that we added
                     if (index < initialContextCount)
                         return false;
 
-                    var lineStart = text.Lines.GetLinePosition(span.TextSpan.Start).Line;
-                    var lineEnd = text.Lines.GetLinePosition(span.TextSpan.End).Line;
-                    if (lineStart == lastAddedLineStart && lastAddedLineEnd == lineEnd)
+                    if (span.IsOverlappingBlockSpan(text.Lines, lastSpan))
                         return true;
 
-                    lastAddedLineStart = lineStart;
-                    lastAddedLineEnd = lineEnd;
-
+                    lastSpan = span;
                     return false;
                 },
                 arg: default(VoidResult));