Skip to content

Commit 7b6a527

Browse files
committed
TypeCandidateService does not use Where
1 parent 117a2c4 commit 7b6a527

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeSearch/TypeCandiateService.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ public sealed class TypeCandiateService
88
{
99

1010
private readonly ITypeCandiateProvider typeCandiateProvider;
11-
private readonly IIntrinsicTypePolicy intrinsicTypePolicy;
12-
private readonly ITypeCompatibilityPolicy typeCompatibilityPolicy;
1311

1412
private readonly Dictionary<Type, Type[]> typeCache = new Dictionary<Type, Type[]>();
1513

16-
public TypeCandiateService (ITypeCandiateProvider typeCandiateProvider, IIntrinsicTypePolicy intrinsicTypePolicy, ITypeCompatibilityPolicy typeCompatibilityPolicy)
14+
public TypeCandiateService (ITypeCandiateProvider typeCandiateProvider)
1715
{
1816
this.typeCandiateProvider = typeCandiateProvider ?? throw new ArgumentNullException(nameof(typeCandiateProvider));
19-
this.intrinsicTypePolicy = intrinsicTypePolicy ?? throw new ArgumentNullException(nameof(intrinsicTypePolicy));
20-
this.typeCompatibilityPolicy = typeCompatibilityPolicy ?? throw new ArgumentNullException(nameof(typeCompatibilityPolicy));
2117
}
2218

2319
public IReadOnlyList<Type> GetDisplayableTypes (Type baseType)
@@ -33,8 +29,6 @@ public IReadOnlyList<Type> GetDisplayableTypes (Type baseType)
3329

3430
var candiateTypes = typeCandiateProvider.GetTypeCandidates(baseType);
3531
var result = candiateTypes
36-
.Where(intrinsicTypePolicy.IsAllowed)
37-
.Where(t => typeCompatibilityPolicy.IsCompatible(baseType, t))
3832
.Distinct()
3933
.ToArray();
4034

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeSearch/TypeSearchService.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,18 @@
33
public static class TypeSearchService
44
{
55

6-
public static readonly IIntrinsicTypePolicy IntrinsicTypePolicy;
7-
public static readonly ITypeCompatibilityPolicy TypeCompatibilityPolicy;
86
public static readonly ITypeCandiateProvider TypeCandiateProvider;
97
public static readonly TypeCandiateService TypeCandiateService;
108

119
static TypeSearchService ()
1210
{
13-
IntrinsicTypePolicy = DefaultIntrinsicTypePolicy.Instance;
14-
1511
#if UNITY_2023_2_OR_NEWER
16-
TypeCompatibilityPolicy = Unity_2023_2_OrNewer_GenericVarianceTypeCompatibilityPolicy.Instance;
1712
TypeCandiateProvider = Unity_2023_2_OrNewer_TypeCandiateProvider.Instance;
1813
#else
19-
TypeCompatibilityPolicy = DefaultTypeCompatibilityPolicy.Instance;
2014
TypeCandiateProvider = DefaultTypeCandiateProvider.Instance;
2115
#endif
2216

23-
TypeCandiateService = new TypeCandiateService(TypeCandiateProvider, IntrinsicTypePolicy, TypeCompatibilityPolicy);
17+
TypeCandiateService = new TypeCandiateService(TypeCandiateProvider);
2418
}
2519
}
2620
}

0 commit comments

Comments
 (0)