Skip to content

Commit 6957507

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Make FragmentImpl.element type ElementImpl.
Change-Id: I3a028685c850acb36108106ae034fa2d909d58bc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445740 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 9bd6cbc commit 6957507

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3402,6 +3402,9 @@ abstract class FragmentImpl with _FragmentImplMixin implements Fragment {
34023402
/// is `f=`, instead of `f`.
34033403
String get displayName => name ?? '';
34043404

3405+
@override
3406+
ElementImpl get element;
3407+
34053408
/// Return the enclosing unit element (which might be the same as `this`), or
34063409
/// `null` if this element is not contained in any compilation unit.
34073410
LibraryFragmentImpl get enclosingUnit {
@@ -5463,7 +5466,8 @@ class LabelElementImpl extends ElementImpl implements LabelElement {
54635466
}
54645467

54655468
class LabelFragmentImpl extends FragmentImpl implements LabelFragment {
5466-
late final LabelElementImpl element2 = LabelElementImpl(this);
5469+
@override
5470+
late final LabelElementImpl element = LabelElementImpl(this);
54675471

54685472
@override
54695473
final String? name;
@@ -5492,9 +5496,6 @@ class LabelFragmentImpl extends FragmentImpl implements LabelFragment {
54925496
@override
54935497
String get displayName => name ?? '';
54945498

5495-
@override
5496-
LabelElement get element => element2;
5497-
54985499
@override
54995500
ExecutableFragmentImpl get enclosingFragment =>
55005501
super.enclosingFragment as ExecutableFragmentImpl;

pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ class DuplicateDefinitionVerifier {
324324
),
325325
);
326326
} else {
327-
setterScope[lookupName] = fragment.element as ElementImpl;
327+
setterScope[lookupName] = fragment.element;
328328
}
329329
}
330330
} else {
@@ -340,7 +340,7 @@ class DuplicateDefinitionVerifier {
340340
),
341341
);
342342
} else {
343-
getterScope[lookupName] = fragment.element as ElementImpl;
343+
getterScope[lookupName] = fragment.element;
344344
}
345345
}
346346
}
@@ -599,7 +599,7 @@ class MemberDuplicateDefinitionVerifier {
599599
var scopeEntry = scope[name];
600600
switch (scopeEntry) {
601601
case null:
602-
scope[name] = _ScopeEntryElement(fragment.element as ElementImpl);
602+
scope[name] = _ScopeEntryElement(fragment.element);
603603
case _ScopeEntryElement(element: GetterElementImpl previous)
604604
when fragment is SetterFragmentImpl:
605605
scope[name] = _ScopeEntryGetterSetterPair(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ extension ElementOrNullExtension on FragmentImpl? {
160160
} else if (self is InterfaceFragmentImpl) {
161161
return self.element;
162162
} else if (self is LabelFragmentImpl) {
163-
return self.element2;
163+
return self.element;
164164
} else if (self is LocalVariableFragmentImpl) {
165165
return self.element;
166166
} else if (self is NeverFragmentImpl) {

0 commit comments

Comments
 (0)