Skip to content

Commit a54c211

Browse files
committed
Elements. Remove TopLevelVariableMember.
Change-Id: Ied29316b3c2b87297d5b9878052ab6b6a333b5cb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416282 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Phil Quitslund <[email protected]>
1 parent ba73144 commit a54c211

File tree

2 files changed

+2
-71
lines changed

2 files changed

+2
-71
lines changed

pkg/analyzer/lib/src/dart/analysis/driver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ import 'package:meta/meta.dart';
100100
// TODO(scheglov): Clean up the list of implicitly analyzed files.
101101
class AnalysisDriver {
102102
/// The version of data format, should be incremented on every format change.
103-
static const int DATA_VERSION = 445;
103+
static const int DATA_VERSION = 446;
104104

105105
/// The number of exception contexts allowed to write. Once this field is
106106
/// zero, we stop writing any new exception contexts in this process.

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

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,8 +1472,7 @@ abstract class PropertyAccessorMember extends ExecutableMember
14721472
if (variable is FieldElementImpl) {
14731473
return FieldMember(variable, augmentationSubstitution, _substitution);
14741474
} else if (variable is TopLevelVariableElementImpl) {
1475-
return TopLevelVariableMember(
1476-
variable, augmentationSubstitution, _substitution);
1475+
return variable;
14771476
}
14781477
return variable;
14791478
}
@@ -1643,74 +1642,6 @@ class SuperFormalParameterMember extends ParameterMember
16431642
visitor.visitSuperFormalParameterElement(this);
16441643
}
16451644

1646-
class TopLevelVariableMember extends VariableMember
1647-
implements TopLevelVariableElement, PropertyInducingElementOrMember {
1648-
TopLevelVariableMember(
1649-
super.declaration,
1650-
super.augmentationSubstitution,
1651-
super.substitution,
1652-
);
1653-
1654-
@override
1655-
TopLevelVariableElementImpl get declaration =>
1656-
_declaration as TopLevelVariableElementImpl;
1657-
1658-
@override
1659-
String get displayName => declaration.displayName;
1660-
1661-
@override
1662-
PropertyAccessorElement? get getter {
1663-
var baseGetter = declaration.getter;
1664-
if (baseGetter == null) {
1665-
return null;
1666-
}
1667-
return PropertyAccessorMember(
1668-
baseGetter, augmentationSubstitution, _substitution);
1669-
}
1670-
1671-
@override
1672-
bool get hasInitializer => declaration.hasInitializer;
1673-
1674-
@override
1675-
bool get isAugmentation => declaration.isAugmentation;
1676-
1677-
@override
1678-
bool get isExternal => declaration.isExternal;
1679-
1680-
@override
1681-
LibraryElementImpl get library {
1682-
return _declaration.library as LibraryElementImpl;
1683-
}
1684-
1685-
@override
1686-
LibraryElementImpl get library2 => library;
1687-
1688-
@override
1689-
String get name => declaration.name;
1690-
1691-
@override
1692-
PropertyAccessorElement? get setter {
1693-
var baseSetter = declaration.setter;
1694-
if (baseSetter == null) {
1695-
return null;
1696-
}
1697-
return PropertyAccessorMember(
1698-
baseSetter, augmentationSubstitution, _substitution);
1699-
}
1700-
1701-
@override
1702-
Source get source => _declaration.source!;
1703-
1704-
@override
1705-
TopLevelVariableElement2 get _element2 => declaration.asElement2;
1706-
1707-
@Deprecated('Use Element2 and accept2() instead')
1708-
@override
1709-
T? accept<T>(ElementVisitor<T> visitor) {
1710-
return visitor.visitTopLevelVariableElement(this);
1711-
}
1712-
}
1713-
17141645
/// A variable element defined in a parameterized type where the values of the
17151646
/// type parameters are known.
17161647
abstract class VariableMember extends Member

0 commit comments

Comments
 (0)