Skip to content

Commit 56672b9

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate PropertyElementResolver.
Change-Id: I0ce77ec9ae4ec5a3e3342a66a914fa8c5f837960 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/409203 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Phil Quitslund <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 1a0b1fe commit 56672b9

File tree

7 files changed

+133
-156
lines changed

7 files changed

+133
-156
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ class InheritanceManager3 {
174174
/// This is equivalent to `getInheritedMap(type)[name]`.
175175
// This is a replacement for `getInherited2`.
176176
@experimental
177-
ExecutableElement2? getInherited4(InterfaceElement2 element, Name name) {
177+
ExecutableElement2OrMember? getInherited4(InterfaceElement2 element, Name name) {
178178
var oldElement = getInheritedMap2(element.asElement)[name];
179-
return oldElement.asElement2;
179+
return oldElement?.asElement2;
180180
}
181181

182182
/// Returns signatures of all concrete members that the given [element]
@@ -375,7 +375,7 @@ class InheritanceManager3 {
375375
/// `class C extends S with M1, M2, M3`, only `S` and `M1` are considered.
376376
// This is a replacement for `getMember2`.
377377
@experimental
378-
ExecutableElement2? getMember4(
378+
ExecutableElement2OrMember? getMember4(
379379
InterfaceElement2 element,
380380
Name name, {
381381
bool concrete = false,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
10321032
}
10331033

10341034
@override
1035-
GetterElement? lookUpGetter3(
1035+
GetterElement2OrMember? lookUpGetter3(
10361036
String name,
10371037
LibraryElement2 library, {
10381038
bool concrete = false,
@@ -1142,7 +1142,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
11421142
}
11431143

11441144
@override
1145-
SetterElement? lookUpSetter3(
1145+
SetterElement2OrMember? lookUpSetter3(
11461146
String name,
11471147
LibraryElement2 library, {
11481148
bool concrete = false,

0 commit comments

Comments
 (0)