Elements. Remove V1 TopLevelVariableElement.
Change-Id: I90a9e13ebfb55ab6b180b5bd56165baeba952db4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423363
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index 2f84335..ea6a9e5 100644
--- a/pkg/analyzer/api.txt
+++ b/pkg/analyzer/api.txt
@@ -2986,7 +2986,6 @@
parts (getter: List<PartElement>)
scope (getter: Scope)
session (getter: AnalysisSession)
- topLevelVariables (getter: List<TopLevelVariableElement>)
typeAliases (getter: List<TypeAliasElement>)
DeferredImportElementPrefix (class extends Object implements ImportElementPrefix, deprecated):
new (constructor: DeferredImportElementPrefix Function())
@@ -3331,10 +3330,6 @@
SuperFormalParameterElement (class extends Object implements ParameterElement, deprecated):
new (constructor: SuperFormalParameterElement Function())
superConstructorParameter (getter: ParameterElement?)
- TopLevelVariableElement (class extends Object implements PropertyInducingElement, deprecated):
- new (constructor: TopLevelVariableElement Function())
- declaration (getter: TopLevelVariableElement)
- isExternal (getter: bool)
TypeAliasElement (class extends Object implements TypeParameterizedElement, TypeDefiningElement, deprecated):
new (constructor: TypeAliasElement Function())
aliasedElement (getter: Element?, deprecated)
diff --git a/pkg/analyzer/lib/dart/element/element.dart b/pkg/analyzer/lib/dart/element/element.dart
index 5123957..cf5e4eb 100644
--- a/pkg/analyzer/lib/dart/element/element.dart
+++ b/pkg/analyzer/lib/dart/element/element.dart
@@ -134,9 +134,6 @@
@override
AnalysisSession get session;
- /// The top-level variables declared in this compilation unit.
- List<TopLevelVariableElement> get topLevelVariables;
-
/// The type aliases declared in this compilation unit.
List<TypeAliasElement> get typeAliases;
}
@@ -1552,18 +1549,6 @@
ParameterElement? get superConstructorParameter;
}
-/// A top-level variable.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use TopLevelVariableElement2 instead')
-abstract class TopLevelVariableElement implements PropertyInducingElement {
- @override
- TopLevelVariableElement get declaration;
-
- /// Whether the field was explicitly marked as being external.
- bool get isExternal;
-}
-
/// A type alias (`typedef`).
///
/// Clients may not extend, implement or mix-in this class.
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 10d9ca5..da32dc9 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -1083,7 +1083,6 @@
.cast<SetterFragment>()
.toList();
- @override
List<TopLevelVariableElementImpl> get topLevelVariables {
return _variables;
}
@@ -10149,10 +10148,7 @@
}
class TopLevelVariableElementImpl extends PropertyInducingElementImpl
- implements
- // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
- TopLevelVariableElement,
- TopLevelVariableFragment {
+ implements TopLevelVariableFragment {
@override
late TopLevelVariableElementImpl2 element;
@@ -10163,7 +10159,6 @@
@override
TopLevelVariableElementImpl get declaration => this;
- @override
bool get isExternal {
return hasModifier(Modifier.EXTERNAL);
}