Skip to content

Override MethodRef.ToString() for better error messages #330

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
AArnott merged 1 commit into from
Jun 24, 2022
Merged

Override MethodRef.ToString() for better error messages #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Microsoft.VisualStudio.Composition/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ Microsoft.VisualStudio.Composition.ComposablePartDefinition.ComposablePartDefini
Microsoft.VisualStudio.Composition.ComposablePartDefinition.OnImportsSatisfiedMethodRefs.get -> System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.Reflection.MethodRef!>!
Microsoft.VisualStudio.Composition.ComposablePartDefinition.OnImportsSatisfiedMethods.get -> System.Collections.Generic.IEnumerable<System.Reflection.MethodInfo!>!
Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimePart.OnImportsSatisfiedMethodRefs.get -> System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.Reflection.MethodRef!>!
Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimePart.RuntimePart(Microsoft.VisualStudio.Composition.Reflection.TypeRef! type, Microsoft.VisualStudio.Composition.Reflection.MethodRef? importingConstructor, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimeImport!>! importingConstructorArguments, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimeImport!>! importingMembers, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimeExport!>! exports, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.Reflection.MethodRef!>! onImportsSatisfiedMethods, string? sharingBoundary) -> void
Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimePart.RuntimePart(Microsoft.VisualStudio.Composition.Reflection.TypeRef! type, Microsoft.VisualStudio.Composition.Reflection.MethodRef? importingConstructor, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimeImport!>! importingConstructorArguments, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimeImport!>! importingMembers, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.RuntimeComposition.RuntimeExport!>! exports, System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Composition.Reflection.MethodRef!>! onImportsSatisfiedMethods, string? sharingBoundary) -> void
override Microsoft.VisualStudio.Composition.Reflection.MethodRef.ToString() -> string!
4 changes: 3 additions & 1 deletion src/Microsoft.VisualStudio.Composition/Reflection/MethodRef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class MethodRef : MemberRef, IEquatable<MethodRef>
/// Gets the string to display in the debugger watch window for this value.
/// </summary>
[DebuggerBrowsable(DebuggerBrowsableState.Never)]
internal virtual string DebuggerDisplay => $"{this.DeclaringType.FullName}.{this.Name}({string.Join(", ", this.ParameterTypes.Select(p => p.FullName))})";
internal virtual string DebuggerDisplay => this.ToString();

public MethodRef(TypeRef declaringType, int metadataToken, string name, bool isStatic, ImmutableArray<TypeRef> parameterTypes, ImmutableArray<TypeRef> genericMethodArguments)
: base(declaringType, metadataToken, isStatic)
Expand Down Expand Up @@ -104,5 +104,7 @@ protected override bool EqualsByTypeLocalMetadata(MemberRef other)
public override int GetHashCode() => this.DeclaringType.GetHashCode() + this.Name.GetHashCode();

public bool Equals(MethodRef? other) => this.Equals((MemberRef?)other);

public override string ToString() => $"{this.DeclaringType.FullName}.{this.Name}({string.Join(", ", this.ParameterTypes.Select(p => p.FullName))})";
}
}
8 changes: 8 additions & 0 deletions test/Microsoft.VisualStudio.Composition.Tests/Reflection/MethodRefTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,13 @@ public void MethodInfo_FromMetadataToken()
var methodRef = new MethodRef(TypeRef.Get(this.GetType(), Resolver.DefaultInstance), methodInfo.MetadataToken, methodInfo.Name, methodInfo.IsStatic, ImmutableArray<TypeRef>.Empty, ImmutableArray<TypeRef>.Empty);
Assert.Same(methodInfo, methodRef.MethodBase);
}

[Fact]
public void ToString_Override()
{
MethodInfo methodInfo = this.GetType().GetTypeInfo().GetMethod(nameof(this.ToString_Override))!;
var methodRef = new MethodRef(TypeRef.Get(this.GetType(), Resolver.DefaultInstance), methodInfo.MetadataToken, methodInfo.Name, methodInfo.IsStatic, ImmutableArray<TypeRef>.Empty, ImmutableArray<TypeRef>.Empty);
Assert.Equal("Microsoft.VisualStudio.Composition.Tests.Reflection.MethodRefTests.ToString_Override()", methodRef.ToString());
}
}
}