File tree 2 files changed +7
-8
lines changed
2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -100,9 +100,7 @@ class ElementType extends Privacy {
100
100
} else {
101
101
typeArguments = type.typeFormals.map ((f) => f.type);
102
102
}
103
- return typeArguments
104
- .map (_getElementTypeFrom)
105
- .toList ();
103
+ return typeArguments.map (_getElementTypeFrom).toList ();
106
104
} else {
107
105
return (_type as ParameterizedType )
108
106
.typeArguments
Original file line number Diff line number Diff line change @@ -563,9 +563,11 @@ class Class extends ModelElement
563
563
564
564
Map <String , List <ModelElement >> _membersByName;
565
565
566
+ /// Given a ModelElement that is a member of some other class, return
567
+ /// a member of this class that has the same name and return type.
568
+ ///
566
569
/// This enables object substitution for canonicalization, such as Interceptor
567
- /// for Object. Uses the name of the ModelElement and its type to retrieve a
568
- /// matching ModelElement.
570
+ /// for Object.
569
571
ModelElement memberByExample (ModelElement example) {
570
572
if (_membersByName == null ) {
571
573
_membersByName = new Map ();
@@ -579,11 +581,10 @@ class Class extends ModelElement
579
581
Iterable <ModelElement > possibleMembers = _membersByName[example.name]
580
582
.where ((e) => e.runtimeType == example.runtimeType);
581
583
if (example.runtimeType == Accessor ) {
582
- member = possibleMembers.singleWhere (
584
+ possibleMembers = possibleMembers.where (
583
585
(e) => (example as Accessor ).isGetter == (e as Accessor ).isGetter);
584
- } else {
585
- member = possibleMembers.first;
586
586
}
587
+ member = possibleMembers.first;
587
588
assert (possibleMembers.length == 1 );
588
589
return member;
589
590
}
You can’t perform that action at this time.
0 commit comments