Skip to content
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

Jump to bottom

Don't list extension methods multiple times #1620

Merged
merged 4 commits into from
Feb 26, 2023
Merged

Don't list extension methods multiple times #1620

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
e9bb7e5
Don't return same method multiple times
slozier Dec 14, 2022
ee64134
Deduplicate in PythonExtensionBinder instead
slozier Dec 16, 2022
6556eae
Re-enable test
slozier Feb 25, 2023
a05ac85
Disable on .NET Core 2.1
slozier Feb 25, 2023
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
7 changes: 4 additions & 3 deletions Src/IronPython/Runtime/Binding/PythonExtensionBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public PythonExtensionBinder(PythonBinder binder, ExtensionMethodSet extensionMe
public override MemberGroup GetMember(MemberRequestKind actionKind, Type type, string name) {
var res = base.GetMember(actionKind, type, name);
if (res.Count == 0) {
List<MemberTracker> trackers = new List<MemberTracker>();
// GetExtensionMethods may return duplicate MethodInfo so use a HashSet - https://github.com/IronLanguages/ironpython2/issues/810
HashSet<MemberTracker> trackers = null;

foreach (var method in _extMethodSet.GetExtensionMethods(name)) {
var parameters = method.GetParameters();
Expand All @@ -34,11 +35,11 @@ public override MemberGroup GetMember(MemberRequestKind actionKind, Type type, s
var paramType = parameters[0].ParameterType;

if (IsApplicableExtensionMethod(type, paramType)) {
trackers.Add(MemberTracker.FromMemberInfo(method, paramType));
(trackers ??= new HashSet<MemberTracker>()).Add(MemberTracker.FromMemberInfo(method, paramType));
}
}

if (trackers.Count > 0) {
if (trackers is not null) {
return new MemberGroup(trackers.ToArray());
}
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/test_cliclass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,9 +1869,9 @@ class MyXamlRootObject(XamlTestObject):
finally:
os.unlink(fname)

@unittest.skipIf(is_netcoreapp, "https://github.com/IronLanguages/ironpython2/issues/810")
@unittest.skipIf(is_netcoreapp21, "TODO: figure out")
def test_extension_methods(self):
import clr, imp, os
import clr, os
if is_netcoreapp:
clr.AddReference('System.Linq')
else:
Expand Down