Skip to content

Extensions: handle extensions in VB SymbolDisplay #78512

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
jcouv merged 4 commits into from
May 9, 2025
Merged

Extensions: handle extensions in VB SymbolDisplay #78512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e013892
Extensions: handle extensions in VB SymbolDisplay
jcouv May 8, 2025
2d802c9
Test from metadata
jcouv May 8, 2025
08bcb1f
Test on C# PE symbols
jcouv May 9, 2025
43d2a01
Remove conditional logic
jcouv May 9, 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
5 changes: 3 additions & 2 deletions src/Compilers/VisualBasic/Portable/SymbolDisplay/SymbolDisplayVisitor.Types.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
End If

If symbolName Is Nothing Then
symbolName = symbol.Name
symbolName = If(symbol.IsExtension, symbol.MetadataName, symbol.Name)
End If

If Format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.UseErrorTypeSymbolName) AndAlso
Expand All @@ -252,7 +252,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic

Select Case symbol.TypeKind
Case TypeKind.Class,
TypeKind.Submission
TypeKind.Submission,
TypeKind.Extension
partKind = SymbolDisplayPartKind.ClassName
Case TypeKind.Delegate
partKind = SymbolDisplayPartKind.DelegateName
Expand Down
113 changes: 112 additions & 1 deletion src/Compilers/VisualBasic/Test/Symbol/SymbolDisplay/SymbolDisplayTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5898,7 +5898,7 @@ class Program
SymbolDisplayPartKind.Keyword,
SymbolDisplayPartKind.Space,
SymbolDisplayPartKind.Keyword)
End sub
End Sub

<Fact>
Public Sub UseLongHandValueTuple()
Expand Down Expand Up @@ -6032,6 +6032,117 @@ end class"
actual:=displayParts)
End Sub

<Theory, CombinatorialData>
Public Sub TestExtensionBlockCSharp_01(useMetadata As Boolean)
Dim text =
<text>
static class E
{
extension(object o)
{
public void M() { }
}
}
</text>.Value

Dim format = New SymbolDisplayFormat(
typeQualificationStyle:=SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
memberOptions:=SymbolDisplayMemberOptions.IncludeParameters Or
SymbolDisplayMemberOptions.IncludeModifiers Or
SymbolDisplayMemberOptions.IncludeAccessibility Or
SymbolDisplayMemberOptions.IncludeType Or
SymbolDisplayMemberOptions.IncludeContainingType,
kindOptions:=SymbolDisplayKindOptions.IncludeMemberKeyword,
parameterOptions:=SymbolDisplayParameterOptions.IncludeType Or
SymbolDisplayParameterOptions.IncludeName Or
SymbolDisplayParameterOptions.IncludeDefaultValue,
miscellaneousOptions:=SymbolDisplayMiscellaneousOptions.UseSpecialTypes)

Dim parseOptions = CSharp.CSharpParseOptions.Default.WithLanguageVersion(CSharp.LanguageVersion.Preview)
Dim comp As Compilation
If useMetadata Then
Dim libComp = CreateCSharpCompilation("c", text, parseOptions:=parseOptions)
comp = CreateCSharpCompilation("d", code:="", parseOptions:=parseOptions, referencedAssemblies:={libComp.EmitToImageReference()})
Else
comp = CreateCSharpCompilation("c", text, parseOptions:=parseOptions)
End If

Dim e = DirectCast(comp.GlobalNamespace.GetMembers("E").Single(), ITypeSymbol)
Dim extension = e.GetMembers().OfType(Of ITypeSymbol).Single()

Assert.Equal("E.<>E__0", SymbolDisplay.ToDisplayString(extension, format))

Dim parts = SymbolDisplay.ToDisplayParts(extension, format)
Verify(parts,
"E.<>E__0",
SymbolDisplayPartKind.ClassName,
SymbolDisplayPartKind.Operator,
SymbolDisplayPartKind.ClassName)

Dim skeletonM = extension.GetMembers("M").Single()
Assert.Equal("Public Sub E.<>E__0.M()", SymbolDisplay.ToDisplayString(skeletonM, format))
End Sub

<Theory, CombinatorialData>
Public Sub TestExtensionBlockCSharp_02(useMetadata As Boolean)
Dim text =
<text>
<![CDATA[
static class E
{
extension<T>(T t)
{
public void M() { }
}
}
]]>
</text>.Value

Dim format = New SymbolDisplayFormat(
typeQualificationStyle:=SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
memberOptions:=SymbolDisplayMemberOptions.IncludeParameters Or
SymbolDisplayMemberOptions.IncludeModifiers Or
SymbolDisplayMemberOptions.IncludeAccessibility Or
SymbolDisplayMemberOptions.IncludeType Or
SymbolDisplayMemberOptions.IncludeContainingType,
kindOptions:=SymbolDisplayKindOptions.IncludeMemberKeyword,
genericsOptions:=SymbolDisplayGenericsOptions.IncludeTypeParameters,
parameterOptions:=SymbolDisplayParameterOptions.IncludeType Or
SymbolDisplayParameterOptions.IncludeName Or
SymbolDisplayParameterOptions.IncludeDefaultValue,
miscellaneousOptions:=SymbolDisplayMiscellaneousOptions.UseSpecialTypes)

Dim parseOptions = CSharp.CSharpParseOptions.Default.WithLanguageVersion(CSharp.LanguageVersion.Preview)
Dim comp As Compilation
If useMetadata Then
Dim libComp = CreateCSharpCompilation("c", text, parseOptions:=parseOptions)
comp = CreateCSharpCompilation("d", code:="", parseOptions:=parseOptions, referencedAssemblies:={libComp.EmitToImageReference()})
Else
comp = CreateCSharpCompilation("c", text, parseOptions:=parseOptions)
End If

Dim e = DirectCast(comp.GlobalNamespace.GetMembers("E").Single(), ITypeSymbol)
Dim extension = e.GetMembers().OfType(Of ITypeSymbol).Single()

' Tracked by https://github.com/dotnet/roslyn/issues/76130 : the arity should not be included in the extension type name
Assert.Equal("E.<>E__0`1(Of T)", SymbolDisplay.ToDisplayString(extension, format))

Dim parts = SymbolDisplay.ToDisplayParts(extension, format)
Verify(parts,
"E.<>E__0`1(Of T)",
SymbolDisplayPartKind.ClassName,
SymbolDisplayPartKind.Operator,
SymbolDisplayPartKind.ClassName,
SymbolDisplayPartKind.Punctuation,
SymbolDisplayPartKind.Keyword,
SymbolDisplayPartKind.Space,
SymbolDisplayPartKind.TypeParameterName,
SymbolDisplayPartKind.Punctuation)

Dim skeletonM = extension.GetMembers("M").Single()
Assert.Equal("Public Sub E.<>E__0`1(Of T).M()", SymbolDisplay.ToDisplayString(skeletonM, format))
End Sub

#Region "Helpers"

Private Shared Sub TestSymbolDescription(
Expand Down