Support code folding for argument lists #71064

Youssef1313 · 2023-12-02T22:25:09Z

Youssef1313 · 2023-12-04T21:28:43Z

@CyrusNajmabadi Could you review this small PR? (assuming the linked issue is something you want to fix)

CyrusNajmabadi · 2023-12-04T21:33:25Z

src/Features/CSharp/Portable/Structure/Providers/ArgumentListStructureProvider.cs

+using Microsoft.CodeAnalysis.Shared.Collections;
+using Microsoft.CodeAnalysis.Structure;
+
+namespace Microsoft.CodeAnalysis.CSharp.Structure


file scoped namespace.

CyrusNajmabadi · 2023-12-04T21:33:57Z

src/EditorFeatures/CSharpTest/Structure/ArgumentListSyntaxStructureTests.cs

+            """;
+
+        await VerifyBlockSpansAsync(code);
+    }


test with just two args on different lines.

CyrusNajmabadi · 2023-12-04T21:34:47Z

src/EditorFeatures/CSharpTest/Structure/ArgumentListSyntaxStructureTests.cs

+        var code = """
+            var x = M$${|span:(
+                "",
+                "")|};


what's the experience you have in the IDE if you have:

var v = M(N( "", ""));

In other words, how does nesting impact things, when the outer/inner are on the same start/end lines.

@CyrusNajmabadi I wasn't able to get RoslynDeployment work properly. https://www.youtube.com/watch?v=ND8dDO6oJ4U see around 38:00

CyrusNajmabadi · 2023-12-05T17:02:29Z

I'll try this out locally.

CyrusNajmabadi · 2023-12-05T17:38:19Z

So the experience is unfortunately not ok currently:

An option it to make it so that the innermost or outermost of a set of invocations with the same start line is collapsable, instead of all of htem.

Probably the innermost makes the most sense so you still see as much code as possible.

Youssef1313 · 2023-12-09T20:02:55Z

@CyrusNajmabadi Is it better now?

src/Compilers/Core/Portable/Collections/TemporaryArray`1.cs

CyrusNajmabadi · 2023-12-18T19:20:33Z

src/Compilers/Core/Portable/Collections/TemporaryArray`1.cs

+                return;
+            }
+
+            switch (_count)


can you use: https://learn.microsoft.com/en-us/dotnet/api/system.memoryextensions.sort?view=net-8.0 instead?

Basically:

Span<T> span = MemoryMarshal.CreateSpan(ref _item0, this.Count); span.Sort(comparison);

?

Not available in netstandard2.0 😕

Gah. @stephentoub Any recommendations on how to best sort a span in netstandard2.0?

CyrusNajmabadi · 2023-12-18T19:23:01Z

src/Compilers/Core/CodeAnalysisTest/Collections/TemporaryArrayTests.cs

@@ -205,6 +206,69 @@ public void TestReverseContents([CombinatorialRange(0, 6)] int initialItems)
                Assert.Equal(array[i], initialItems - 1 - i);
        }

+        [Fact]
+        public void TestSort()


i would take everything out related to sorting TempArray. We don't even relaly need temparray for block-structure. That's an array that's good when you commonly have <4 elements. But for block structure, we'd almost alwayshave more. So we can just pass an ArrayBuilder along instead).

or, we can keep this. i'm on the fence.

@CyrusNajmabadi I had the same feeling the TemporaryArray might not be very suitable for this scenario, but I preferred to limit the scope of my changes.

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

AlekseyTs

Changes under Compilers LGTM (commit 9)

…tureProvider.cs Co-authored-by: Cyrus Najmabadi <[email protected]>

Youssef1313 · 2024-01-20T09:01:23Z

src/Features/Lsif/GeneratorTest/FoldingRangeTests.vb

@@ -54,7 +54,7 @@ using System.Linq;|}", "imports", "...")>
                    </Workspace>, openDocuments:=False, composition:=TestLsifOutput.TestComposition)

                Dim annotatedLocations = Await AbstractLanguageServerProtocolTests.GetAnnotatedLocationsAsync(workspace, workspace.CurrentSolution)
-                Dim expectedRanges = annotatedLocations("foldingRange").Select(Function(location) CreateFoldingRange(rangeKind, location.Range, collapsedText)).OrderBy(Function(range) range.StartLine).ToArray()
+                Dim expectedRanges = annotatedLocations("foldingRange").Select(Function(location) CreateFoldingRange(rangeKind, location.Range, collapsedText)).OrderByDescending(Function(range) range.StartLine).ToArray()


The order of the returned spans changed with the changes in this PR. I think the order shouldn't matter. So, I updated this test (and some others) to assert against the new order.

I think the tests could even ignore the order when comparing, but I didn't do that for now.

@CyrusNajmabadi Let me know your thoughts.

Youssef1313 · 2024-02-11T15:20:41Z

@CyrusNajmabadi Can you take a look please? Thanks!

Youssef1313 · 2024-02-17T21:44:35Z

@CyrusNajmabadi Friendly reminder on this PR. Thanks!

CyrusNajmabadi · 2024-02-17T21:48:44Z

Yup yup. Thanks for the reminder!

Support code folding for argument lists

5254fb4

Youssef1313 requested a review from a team as a code owner December 2, 2023 22:25

dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Dec 2, 2023

ghost added the Community The pull request was submitted by a contributor who is not a Microsoft employee. label Dec 2, 2023

Fix failing tests

babf187

CyrusNajmabadi reviewed Dec 4, 2023

View reviewed changes

Address comments

5f4aaa5

Youssef1313 requested a review from CyrusNajmabadi December 5, 2023 07:00

Merge remote-tracking branch 'upstream/main' into code-fold-argumentlist

de94736

Address review comment

6c6446a

Only collapse inner span

d9319b4

Youssef1313 requested a review from a team as a code owner December 15, 2023 20:19

Youssef1313 added 2 commits December 15, 2023 22:19

Cleanup

49e5f85

Cleanup

5b91cd3

AlekseyTs reviewed Dec 18, 2023

View reviewed changes

src/Compilers/Core/Portable/Collections/TemporaryArray`1.cs Outdated Show resolved Hide resolved

Address review comment

5d0196c

CyrusNajmabadi reviewed Dec 18, 2023

View reviewed changes

src/Features/Core/Portable/Structure/Syntax/AbstractBlockStructureProvider.cs Outdated Show resolved Hide resolved

AlekseyTs approved these changes Dec 18, 2023

View reviewed changes

Youssef1313 and others added 2 commits December 21, 2023 21:47

Update src/Features/Core/Portable/Structure/Syntax/AbstractBlockStruc…

013dd11

…tureProvider.cs Co-authored-by: Cyrus Najmabadi <[email protected]>

Fix tests

3255b94

Youssef1313 commented Jan 20, 2024

View reviewed changes

build-analysis bot mentioned this pull request Jan 20, 2024

The active test run was aborted. Reason: Test host process crashed dotnet/dnceng#451

Open

3 tasks

Fix a test

01ae12f

Youssef1313 requested a review from CyrusNajmabadi January 20, 2024 14:04

Merge branch 'main' into code-fold-argumentlist

e558973

CyrusNajmabadi approved these changes Feb 17, 2024

View reviewed changes

CyrusNajmabadi merged commit cab5afb into dotnet:main Feb 17, 2024
30 checks passed

Youssef1313 deleted the code-fold-argumentlist branch February 17, 2024 21:50

ghost added this to the Next milestone Feb 17, 2024

Cosifne mentioned this pull request Feb 21, 2024

[Automated] PRs inserted in VS build main-34620.00 #72198

Closed

jjonescz modified the milestones: Next, 17.10 P2 Feb 27, 2024

Youssef1313 mentioned this pull request Jun 2, 2024

Methods with Optional String Parameters Won't Collapse #73798

Closed

Cosifne mentioned this pull request Jul 17, 2024

Also checking line end when block structure is filtered #74413

Merged

Cosifne mentioned this pull request Oct 15, 2024

Also compare other properties when remove block spans #75515

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support code folding for argument lists #71064

Support code folding for argument lists #71064

Youssef1313 commented Dec 2, 2023 •

edited

Loading

Youssef1313 commented Dec 4, 2023

CyrusNajmabadi Dec 4, 2023

CyrusNajmabadi Dec 4, 2023

CyrusNajmabadi Dec 4, 2023

Youssef1313 Dec 4, 2023

CyrusNajmabadi commented Dec 5, 2023

CyrusNajmabadi commented Dec 5, 2023

Youssef1313 commented Dec 9, 2023

CyrusNajmabadi Dec 18, 2023

CyrusNajmabadi Dec 18, 2023 •

edited

Loading

Youssef1313 Dec 18, 2023

CyrusNajmabadi Dec 18, 2023

CyrusNajmabadi Dec 18, 2023

CyrusNajmabadi Dec 18, 2023

Youssef1313 Dec 18, 2023

AlekseyTs left a comment

Youssef1313 Jan 20, 2024

Youssef1313 commented Feb 11, 2024

Youssef1313 commented Feb 17, 2024

CyrusNajmabadi commented Feb 17, 2024

Support code folding for argument lists #71064

Support code folding for argument lists #71064

Conversation

Youssef1313 commented Dec 2, 2023 • edited Loading

Youssef1313 commented Dec 4, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CyrusNajmabadi commented Dec 5, 2023

CyrusNajmabadi commented Dec 5, 2023

Youssef1313 commented Dec 9, 2023

Choose a reason for hiding this comment

CyrusNajmabadi Dec 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlekseyTs left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Youssef1313 commented Feb 11, 2024

Youssef1313 commented Feb 17, 2024

CyrusNajmabadi commented Feb 17, 2024

Youssef1313 commented Dec 2, 2023 •

edited

Loading

CyrusNajmabadi Dec 18, 2023 •

edited

Loading