Skip to content

Commit 5fab16a

Browse files
bwilkersonCommit Queue
authored andcommitted
Fix two tests in InheritanceManger3
There are still two failing tests, but I wanted to get these in before some code started depending on the broken behavior. Change-Id: I50f0e282293e756409064491e74c64311fbdf707 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/388666 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 085deb8 commit 5fab16a

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ class InheritanceManager3 {
351351
forMixinIndex: forMixinIndex,
352352
forSuper: forSuper,
353353
);
354-
return element?.declaration.asElement2 as ExecutableElement2?;
354+
return element?.asElement2 as ExecutableElement2?;
355355
}
356356

357357
/// Returns the member with the given [name].
@@ -381,7 +381,7 @@ class InheritanceManager3 {
381381
forMixinIndex: forMixinIndex,
382382
forSuper: forSuper,
383383
);
384-
return oldElement?.declaration.asElement2 as ExecutableElement2?;
384+
return oldElement?.asElement2 as ExecutableElement2?;
385385
}
386386

387387
/// Returns all members of mixins, superclasses, and interfaces that a member

pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,12 +1015,10 @@ class C extends B implements A {}
10151015
concrete: true,
10161016
)!;
10171017
// TODO(scheglov): It would be nice to use `_assertGetMember`.
1018-
expect(member.baseElement,
1019-
same((findElement.method('foo', of: 'B') as MethodFragment).element));
1018+
expect(member.baseElement, same(findElement.method('foo', of: 'B')));
10201019
expect(member.formalParameters[0].isCovariant, isTrue);
10211020
}
10221021

1023-
@FailingTest(reason: 'Members need to implement `Element2` not `Fragment`')
10241022
test_getMember_mixin_notMerge_replace() async {
10251023
await resolveTestCode('''
10261024
class A<T> {
@@ -1282,8 +1280,7 @@ class C extends B implements A {}
12821280
concrete: true,
12831281
)!;
12841282
// TODO(scheglov): It would be nice to use `_assertGetMember`.
1285-
expect(member.baseElement,
1286-
same((findElement.setter('foo', of: 'B') as SetterFragment).element));
1283+
expect(member.baseElement, same(findElement.setter('foo', of: 'B')));
12871284
expect(member.formalParameters[0].isCovariant, isTrue);
12881285
}
12891286

0 commit comments

Comments
 (0)