Skip to content

Fix out of bounds when creating structure guides for types without bodies #79543

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

Merged
merged 2 commits into from
Jul 23, 2025
Merged

Fix out of bounds when creating structure guides for types without bodies #79543

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
fc0fa76
Fix strucutre out of bounds
CyrusNajmabadi Jul 23, 2025
9288f35
Tests
CyrusNajmabadi Jul 23, 2025
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
18 changes: 18 additions & 0 deletions src/EditorFeatures/CSharpTest/Structure/TypeDeclarationStructureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure;
Expand Down Expand Up @@ -231,4 +232,21 @@ public Task TestStructWithNestedComments()
""",
Region("textspan1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Goo ...", autoCollapse: true));

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/62506")]
public Task TestTypeDeclarationNoBraces1()
=> VerifyBlockSpansAsync("""
{|comment:// comment|}
$$struct S
""",
Region("comment", "// comment ...", autoCollapse: true));

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/62506")]
public Task TestTypeDeclarationNoBraces2()
=> VerifyBlockSpansAsync("""
{|comment:// comment|}
{|hint1:$$struct S{|textspan1:;|}|}
""",
Region("comment", "// comment ...", autoCollapse: true),
Region("textspan1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
8 changes: 6 additions & 2 deletions src/Features/CSharp/Portable/Structure/CSharpStructureHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,12 @@ static SyntaxToken GetEndToken(SyntaxNode node)
static SyntaxToken GetHintTextEndToken(SyntaxNode node)
=> node switch
{
EnumDeclarationSyntax enumDeclaration => enumDeclaration.OpenBraceToken.GetPreviousToken(),
TypeDeclarationSyntax typeDeclaration => typeDeclaration.OpenBraceToken.GetPreviousToken(),
EnumDeclarationSyntax enumDeclaration
=> enumDeclaration.OpenBraceToken.GetPreviousToken(),
TypeDeclarationSyntax typeDeclaration
=> typeDeclaration.OpenBraceToken != default
? typeDeclaration.OpenBraceToken.GetPreviousToken()
: typeDeclaration.SemicolonToken.GetPreviousToken(),
_ => node.GetLastToken()
};
}
Expand Down
Loading