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

Account for possible integer indexers when searching for IndexerAccessor #1662

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Account for possible integer indexers when searching for IndexerAccessor #1662

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
18 changes: 11 additions & 7 deletions Jint.Tests/Runtime/InteropTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3297,6 +3297,7 @@ public interface ICountable<out T>
public interface IStringCollection : IIndexer<string>, ICountable<string>
{
string this[string name] { get; }
string this[int index] { get; }
}

public class Strings : IStringCollection
Expand All @@ -3306,14 +3307,8 @@ public Strings(string[] strings)
{
_strings = strings;
}
public string this[string name]
{
get
{
return int.TryParse(name, out var index) ? _strings[index] : _strings.FirstOrDefault(x => x.Contains(name));
}
}

public string this[string name] => null;
public string this[int index] => _strings[index];
public int Count => _strings.Length;
}
Expand All @@ -3332,6 +3327,15 @@ public void AccessingInterfaceShouldContainExtendedInterfaces()
Assert.Equal(3, result);
}

[Fact]
public void IntegerIndexerIfPreferredOverStringIndexerWhenFound()
{
var engine = new Engine();
engine.SetValue("Utils", new Utils());
var result = engine.Evaluate("const strings = Utils.GetStrings(); strings[2];");
Assert.Equal("c", result);
}

[Fact]
public void CanDestructureInteropTargetMethod()
{
Expand Down
40 changes: 33 additions & 7 deletions Jint/Runtime/Interop/Reflection/IndexerAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,25 @@ internal static bool TryFindIndexer(
[NotNullWhen(true)] out IndexerAccessor? indexerAccessor,
[NotNullWhen(true)] out PropertyInfo? indexer)
{
indexerAccessor = null;
indexer = null;
var paramTypeArray = new Type[1];

// integer keys can be ambiguous as we only know string keys
int? integerKey = null;

if (int.TryParse(propertyName, out var intKeyTemp))
{
integerKey = intKeyTemp;
}

IndexerAccessor? ComposeIndexerFactory(PropertyInfo candidate, Type paramType)
{
object? key = null;
// int key is quite common case
if (paramType == typeof(int))
if (paramType == typeof(int) && integerKey is not null)
{
if (int.TryParse(propertyName, out var intValue))
{
key = intValue;
}
key = integerKey;
}
else
{
Expand Down Expand Up @@ -89,6 +96,7 @@ internal static bool TryFindIndexer(
}

// try to find first indexer having either public getter or setter with matching argument type
PropertyInfo? fallbackIndexer = null;
foreach (var candidate in targetType.GetProperties())
{
if (!filter(candidate))
Expand All @@ -108,12 +116,30 @@ internal static bool TryFindIndexer(
indexerAccessor = ComposeIndexerFactory(candidate, paramType);
if (indexerAccessor != null)
{
indexer = candidate;
return true;
if (paramType != typeof(string) || integerKey is null)
{
// exact match, we don't need to check for integer key
indexer = candidate;
return true;
}

if (fallbackIndexer is null)
{
// our fallback
fallbackIndexer = candidate;
}
}
}
}

if (fallbackIndexer is not null)
{
indexer = fallbackIndexer;
// just to keep compiler happy, we know we have a value
indexerAccessor = indexerAccessor ?? new IndexerAccessor(indexer, null, null!);
return true;
}

indexerAccessor = default;
indexer = default;
return false;
Expand Down