Skip to content

Commit e6e16b4

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate more InheritanceManager3.
Change-Id: Ie48b0f588d4b530ed0cc36b88e5fb87bec518fd6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435981 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent a7894ad commit e6e16b4

File tree

9 files changed

+318
-658
lines changed

9 files changed

+318
-658
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3260,7 +3260,7 @@ class FormalParameterElementImpl extends PromotableElementImpl
32603260
}
32613261

32623262
@override
3263-
FormalParameterElement get baseElement => this;
3263+
FormalParameterElementImpl get baseElement => this;
32643264

32653265
@override
32663266
// TODO(augmentations): Implement the merge of formal parameters.
@@ -3410,6 +3410,9 @@ mixin FormalParameterElementMixin
34103410
FormalParameterElement,
34113411
SharedNamedFunctionParameter,
34123412
VariableElement2OrMember {
3413+
@override
3414+
FormalParameterElementImpl get baseElement;
3415+
34133416
ParameterKind get parameterKind;
34143417

34153418
@override
@@ -5280,7 +5283,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
52805283
@override
52815284
Map<Name, ExecutableElement> get interfaceMembers =>
52825285
(session as AnalysisSessionImpl).inheritanceManager
5283-
.getInterface2(this)
5286+
.getInterface(this)
52845287
.map2;
52855288

52865289
@override
@@ -5345,10 +5348,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
53455348

53465349
@override
53475350
ExecutableElement? getInterfaceMember(Name name) =>
5348-
(session as AnalysisSessionImpl).inheritanceManager.getMember(
5349-
this,
5350-
name,
5351-
);
5351+
(session as AnalysisSessionImpl).inheritanceManager.getMember(this, name);
53525352

53535353
@override
53545354
ConstructorElementImpl? getNamedConstructor2(String name) {
@@ -6376,7 +6376,7 @@ class LibraryElementImpl extends ElementImpl
63766376
}
63776377

63786378
@override
6379-
ExtensionTypeElement? getExtensionType(String name) {
6379+
ExtensionTypeElementImpl? getExtensionType(String name) {
63806380
return _getElementByName(extensionTypes, name);
63816381
}
63826382

0 commit comments

Comments
 (0)