Skip to content

Commit 9756c7a

Browse files
committed
Elements. Remove V1 EnumElement.
Change-Id: I1b869b2c66afffbeb6c7555d2183f61536b153e1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423201 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent cd24493 commit 9756c7a

File tree

3 files changed

+1
-85
lines changed

3 files changed

+1
-85
lines changed

pkg/analyzer/api.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2958,10 +2958,6 @@ package:analyzer/dart/constant/value.dart:
29582958
toSymbolValue (method: String? Function())
29592959
toTypeValue (method: DartType? Function())
29602960
package:analyzer/dart/element/element.dart:
2961-
AugmentedEnumElement (class extends Object implements AugmentedInterfaceElement, deprecated):
2962-
new (constructor: AugmentedEnumElement Function())
2963-
constants (getter: List<FieldElement>)
2964-
firstFragment (getter: EnumElement)
29652961
AugmentedExtensionElement (class extends Object implements AugmentedInstanceElement, deprecated):
29662962
new (constructor: AugmentedExtensionElement Function())
29672963
extendedType (getter: DartType)
@@ -3009,7 +3005,6 @@ package:analyzer/dart/element/element.dart:
30093005
accessibleExtensions (getter: List<ExtensionElement>)
30103006
accessors (getter: List<PropertyAccessorElement>)
30113007
enclosingElement3 (getter: CompilationUnitElement?)
3012-
enums (getter: List<EnumElement>)
30133008
extensionTypes (getter: List<ExtensionTypeElement>, experimental)
30143009
extensions (getter: List<ExtensionElement>)
30153010
functions (getter: List<FunctionElement>)
@@ -3023,7 +3018,6 @@ package:analyzer/dart/element/element.dart:
30233018
session (getter: AnalysisSession)
30243019
topLevelVariables (getter: List<TopLevelVariableElement>)
30253020
typeAliases (getter: List<TypeAliasElement>)
3026-
getEnum (method: EnumElement? Function(String))
30273021
ConstructorElement (class extends Object implements ClassMemberElement, ExecutableElement, ConstantEvaluationTarget, deprecated):
30283022
new (constructor: ConstructorElement Function())
30293023
declaration (getter: ConstructorElement)
@@ -3200,9 +3194,6 @@ package:analyzer/dart/element/element.dart:
32003194
new (constructor: ElementLocation Function())
32013195
components (getter: List<String>)
32023196
encoding (getter: String)
3203-
EnumElement (class extends Object implements InterfaceElement, deprecated):
3204-
new (constructor: EnumElement Function())
3205-
augmented (getter: AugmentedEnumElement, deprecated)
32063197
ExecutableElement (class extends Object implements FunctionTypedElement, deprecated):
32073198
new (constructor: ExecutableElement Function())
32083199
declaration (getter: ExecutableElement)

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ import 'package:analyzer/src/task/api/model.dart' show AnalysisTarget;
6060
import 'package:meta/meta.dart';
6161
import 'package:pub_semver/pub_semver.dart';
6262

63-
/// The result of applying augmentations to an [EnumElement].
64-
///
65-
/// Clients may not extend, implement or mix-in this class.
66-
@Deprecated(elementModelDeprecationMsg)
67-
abstract class AugmentedEnumElement implements AugmentedInterfaceElement {
68-
/// The enum constants declared in this element.
69-
List<FieldElement> get constants;
70-
71-
@override
72-
EnumElement get firstFragment;
73-
}
74-
7563
/// The result of applying augmentations to an [ExtensionElement].
7664
///
7765
/// Clients may not extend, implement or mix-in this class.
@@ -279,9 +267,6 @@ abstract class CompilationUnitElement implements UriReferencedElement {
279267
@override
280268
CompilationUnitElement? get enclosingElement3;
281269

282-
/// The enums declared in this compilation unit.
283-
List<EnumElement> get enums;
284-
285270
/// The extensions declared in this compilation unit.
286271
List<ExtensionElement> get extensions;
287272

@@ -326,11 +311,6 @@ abstract class CompilationUnitElement implements UriReferencedElement {
326311

327312
/// The type aliases declared in this compilation unit.
328313
List<TypeAliasElement> get typeAliases;
329-
330-
/// Returns the enum defined in this compilation unit that has the given
331-
/// [name], or `null` if this compilation unit does not define an enum with
332-
/// the given name.
333-
EnumElement? getEnum(String name);
334314
}
335315

336316
/// An element representing a constructor or a factory method defined within a
@@ -1065,16 +1045,6 @@ abstract class ElementLocation {
10651045
String get encoding;
10661046
}
10671047

1068-
/// An element that represents an enum.
1069-
///
1070-
/// Clients may not extend, implement or mix-in this class.
1071-
@Deprecated('Use EnumElement2 instead')
1072-
abstract class EnumElement implements InterfaceElement {
1073-
@Deprecated(elementModelDeprecationMsg)
1074-
@override
1075-
AugmentedEnumElement get augmented;
1076-
}
1077-
10781048
/// An element representing an executable object, including functions, methods,
10791049
/// constructors, getters, and setters.
10801050
///

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

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,6 @@ mixin AugmentableFragment on ElementImpl {
8989
}
9090
}
9191

92-
@Deprecated(elementModelDeprecationMsg)
93-
class AugmentedEnumElementImpl extends AugmentedInterfaceElementImpl
94-
implements AugmentedEnumElement {
95-
AugmentedEnumElementImpl(super.firstFragment);
96-
97-
@override
98-
List<FieldElement> get constants => firstFragment.constants;
99-
100-
@override
101-
EnumElementImpl get firstFragment {
102-
return super.firstFragment as EnumElementImpl;
103-
}
104-
}
105-
10692
@Deprecated(elementModelDeprecationMsg)
10793
class AugmentedExtensionElementImpl extends AugmentedInstanceElementImpl
10894
implements AugmentedExtensionElement {
@@ -1023,7 +1009,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
10231009
return this;
10241010
}
10251011

1026-
@override
10271012
List<EnumElementImpl> get enums {
10281013
return _enums;
10291014
}
@@ -1303,17 +1288,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
13031288
builder.writeCompilationUnitElement(this);
13041289
}
13051290

1306-
@Deprecated(elementModelDeprecationMsg)
1307-
@override
1308-
EnumElement? getEnum(String name) {
1309-
for (var element in enums) {
1310-
if (element.name == name) {
1311-
return element;
1312-
}
1313-
}
1314-
return null;
1315-
}
1316-
13171291
/// Returns the mixin defined in this compilation unit that has the given
13181292
/// [name], or `null` if this compilation unit does not define a mixin with
13191293
/// the given name.
@@ -3618,21 +3592,13 @@ class ElementLocationImpl implements ElementLocation {
36183592
abstract class ElementOrMember {}
36193593

36203594
/// An [InterfaceElementImpl] which is an enum.
3621-
class EnumElementImpl extends InterfaceElementImpl
3622-
implements
3623-
// ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
3624-
EnumElement,
3625-
EnumFragment {
3595+
class EnumElementImpl extends InterfaceElementImpl implements EnumFragment {
36263596
late EnumElementImpl2 augmentedInternal;
36273597

36283598
/// Initialize a newly created class element to have the given [name] at the
36293599
/// given [offset] in the file that contains the declaration of this element.
36303600
EnumElementImpl(super.name, super.offset);
36313601

3632-
@Deprecated(elementModelDeprecationMsg)
3633-
@override
3634-
AugmentedEnumElement get augmented => AugmentedEnumElementImpl(this);
3635-
36363602
List<FieldElementImpl> get constants {
36373603
return fields.where((field) => field.isEnumConstant).toList();
36383604
}
@@ -7539,17 +7505,6 @@ class LibraryElementImpl extends ElementImpl
75397505
return _getElementByName(classes, name);
75407506
}
75417507

7542-
@Deprecated(elementModelDeprecationMsg)
7543-
EnumElement? getEnum(String name) {
7544-
for (var unitElement in units) {
7545-
var element = unitElement.getEnum(name);
7546-
if (element != null) {
7547-
return element;
7548-
}
7549-
}
7550-
return null;
7551-
}
7552-
75537508
@override
75547509
EnumElement2? getEnum2(String name) {
75557510
return _getElementByName(enums, name);

0 commit comments

Comments
 (0)