Skip to content

Commit d83f425

Browse files
committed
Renamed IsAssignableTo as it conflicts with system.
1 parent bdaf073 commit d83f425

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

Shuttle.Core.Reflection.Tests/ReflectionServiceFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public async Task Should_be_able_to_get_runtime_assemblies_async()
1616
[Test]
1717
public async Task Should_be_able_to_get_types_async()
1818
{
19-
Assert.That((await new ReflectionService().GetTypesAssignableToAsync<SomeClass>()).Count(), Is.EqualTo(1));
20-
Assert.That((await new ReflectionService().GetTypesAssignableToAsync<ISomeClass>()).Count(), Is.EqualTo(1));
19+
Assert.That((await new ReflectionService().GetTypesAssignableToExpandedAsync<SomeClass>()).Count(), Is.EqualTo(1));
20+
Assert.That((await new ReflectionService().GetTypesAssignableToExpandedAsync<ISomeClass>()).Count(), Is.EqualTo(1));
2121
}
2222

2323
public async Task Should_be_able_to_get_matching_assemblies_async()

Shuttle.Core.Reflection/EnumerableExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static IEnumerable<T> FindAll<T>(this IEnumerable<object> list) where T :
2525
{
2626
var type = typeof(T);
2727

28-
return Guard.AgainstNull(list).Where(o => TypeExtensions.IsAssignableTo(o.GetType(), type)).Select(o => (T)o).ToList();
28+
return Guard.AgainstNull(list).Where(o => o.GetType().IsAssignableToExpanded(type)).Select(o => (T)o).ToList();
2929
}
3030

3131
public static T Get<T>(this IEnumerable<object> list) where T : class

Shuttle.Core.Reflection/IReflectionService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ public interface IReflectionService
1111
Task<IEnumerable<Assembly>> GetMatchingAssembliesAsync(Regex regex);
1212
Task<IEnumerable<Assembly>> GetRuntimeAssembliesAsync();
1313
Task<Type?> GetTypeAsync(string typeName);
14-
Task<IEnumerable<Type>> GetTypesAssignableToAsync(Type type);
15-
Task<IEnumerable<Type>> GetTypesAssignableToAsync(Type type, Assembly assembly);
14+
Task<IEnumerable<Type>> GetTypesAssignableToExpandedAsync(Type type);
15+
Task<IEnumerable<Type>> GetTypesAssignableToExpandedAsync(Type type, Assembly assembly);
1616
}

Shuttle.Core.Reflection/ReflectionService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public async Task<IEnumerable<Assembly>> GetRuntimeAssembliesAsync()
4343
return await Task.FromResult(result);
4444
}
4545

46-
public async Task<IEnumerable<Type>> GetTypesAssignableToAsync(Type type)
46+
public async Task<IEnumerable<Type>> GetTypesAssignableToExpandedAsync(Type type)
4747
{
4848
var result = new List<Type>();
4949

5050
var assemblies = await this.GetAssembliesAsync().ConfigureAwait(false);
5151

5252
foreach (var assembly in assemblies)
5353
{
54-
var types = await GetTypesAssignableToAsync(type, assembly).ConfigureAwait(false);
54+
var types = await GetTypesAssignableToExpandedAsync(type, assembly).ConfigureAwait(false);
5555

5656
types.Where(candidate => result.Find(existing => existing == candidate) == null)
5757
.ToList()
@@ -61,11 +61,11 @@ public async Task<IEnumerable<Type>> GetTypesAssignableToAsync(Type type)
6161
return result;
6262
}
6363

64-
public async Task<IEnumerable<Type>> GetTypesAssignableToAsync(Type type, Assembly assembly)
64+
public async Task<IEnumerable<Type>> GetTypesAssignableToExpandedAsync(Type type, Assembly assembly)
6565
{
6666
Guard.AgainstNull(type);
6767

68-
return await Task.FromResult(Guard.AgainstNull(assembly).GetTypes().Where(item => TypeExtensions.IsAssignableTo(item, type) && !(item.IsInterface && item == type)).ToList());
68+
return await Task.FromResult(Guard.AgainstNull(assembly).GetTypes().Where(item => item.IsAssignableToExpanded(type) && !(item.IsInterface && item == type)).ToList());
6969
}
7070

7171
public async Task<Type?> GetTypeAsync(string typeName)

Shuttle.Core.Reflection/ReflectionServiceExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ public static async Task<IEnumerable<Assembly>> GetMatchingAssembliesAsync(this
2020
return await Guard.AgainstNull(service).GetMatchingAssembliesAsync(new(Guard.AgainstNullOrEmptyString(regex))).ConfigureAwait(false);
2121
}
2222

23-
public static async Task<IEnumerable<Type>> GetTypesAssignableToAsync<T>(this IReflectionService service)
23+
public static async Task<IEnumerable<Type>> GetTypesAssignableToExpandedAsync<T>(this IReflectionService service)
2424
{
25-
return await Guard.AgainstNull(service).GetTypesAssignableToAsync(typeof(T)).ConfigureAwait(false);
25+
return await Guard.AgainstNull(service).GetTypesAssignableToExpandedAsync(typeof(T)).ConfigureAwait(false);
2626
}
2727

28-
public static async Task<IEnumerable<Type>> GetTypesAssignableToAsync<T>(this IReflectionService service, Assembly assembly)
28+
public static async Task<IEnumerable<Type>> GetTypesAssignableToExpandedAsync<T>(this IReflectionService service, Assembly assembly)
2929
{
30-
return await Guard.AgainstNull(service).GetTypesAssignableToAsync(typeof(T), assembly).ConfigureAwait(false);
30+
return await Guard.AgainstNull(service).GetTypesAssignableToExpandedAsync(typeof(T), assembly).ConfigureAwait(false);
3131
}
3232
}

Shuttle.Core.Reflection/TypeExtensions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static void AssertDefaultConstructor(this Type type, string message)
3636
}
3737
}
3838

39-
return interfaces.FirstOrDefault(item => IsAssignableTo(item, of));
39+
return interfaces.FirstOrDefault(item => IsAssignableToExpanded(item, of));
4040
}
4141

4242
public static Type? GetGenericArgument(this Type type, Type generic)
@@ -75,19 +75,19 @@ public static bool HasDefaultConstructor(this Type type)
7575
return null;
7676
}
7777

78-
public static IEnumerable<Type> InterfacesAssignableTo<T>(this Type type)
78+
public static IEnumerable<Type> InterfacesAssignableToExpanded<T>(this Type type)
7979
{
80-
return type.InterfacesAssignableTo(typeof(T));
80+
return type.InterfacesAssignableToExpanded(typeof(T));
8181
}
8282

83-
public static IEnumerable<Type> InterfacesAssignableTo(this Type type, Type interfaceType)
83+
public static IEnumerable<Type> InterfacesAssignableToExpanded(this Type type, Type interfaceType)
8484
{
8585
Guard.AgainstNull(interfaceType);
8686

87-
return type.GetInterfaces().Where(i => IsAssignableTo(i, interfaceType)).ToList();
87+
return type.GetInterfaces().Where(i => IsAssignableToExpanded(i, interfaceType)).ToList();
8888
}
8989

90-
public static bool IsAssignableTo(this Type type, Type otherType)
90+
public static bool IsAssignableToExpanded(this Type type, Type otherType)
9191
{
9292
Guard.AgainstNull(type);
9393
Guard.AgainstNull(otherType);

0 commit comments

Comments
 (0)