Skip to content

Commit 046199b

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove V1 FieldFormalParameterElement and SuperFormalParameterElement.
Change-Id: Ie19b02e78804f2a67f8770ae86f085799ce730e9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423203 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent f9481e1 commit 046199b

File tree

3 files changed

+12
-40
lines changed

3 files changed

+12
-40
lines changed

pkg/analyzer/api.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3169,9 +3169,6 @@ package:analyzer/dart/element/element.dart:
31693169
isExternal (getter: bool)
31703170
isPromotable (getter: bool)
31713171
isStatic (getter: bool)
3172-
FieldFormalParameterElement (class extends Object implements ParameterElement, deprecated):
3173-
new (constructor: FieldFormalParameterElement Function())
3174-
field (getter: FieldElement?, deprecated)
31753172
FunctionTypedElement (class extends Object implements TypeParameterizedElement, deprecated):
31763173
new (constructor: FunctionTypedElement Function())
31773174
parameters (getter: List<ParameterElement>)
@@ -3289,9 +3286,6 @@ package:analyzer/dart/element/element.dart:
32893286
ShowElementCombinator (class extends Object implements NamespaceCombinator):
32903287
new (constructor: ShowElementCombinator Function())
32913288
shownNames (getter: List<String>)
3292-
SuperFormalParameterElement (class extends Object implements ParameterElement, deprecated):
3293-
new (constructor: SuperFormalParameterElement Function())
3294-
superConstructorParameter (getter: ParameterElement?)
32953289
TypeDefiningElement (class extends Object implements Element, deprecated):
32963290
new (constructor: TypeDefiningElement Function())
32973291
TypeParameterElement (class extends Object implements TypeDefiningElement, deprecated):

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -897,17 +897,6 @@ abstract class FieldElement
897897
bool get isStatic;
898898
}
899899

900-
/// A field formal parameter defined within a constructor element.
901-
///
902-
/// Clients may not extend, implement or mix-in this class.
903-
@Deprecated('Use FieldFormalParameterElement2 instead')
904-
abstract class FieldFormalParameterElement implements ParameterElement {
905-
/// The field element associated with this field formal parameter, or `null`
906-
/// if the parameter references a field that doesn't exist.
907-
@Deprecated(elementModelDeprecationMsg)
908-
FieldElement? get field;
909-
}
910-
911900
/// An element that has a [FunctionType] as its [type].
912901
///
913902
/// This also provides convenient access to the parameters and return type.
@@ -1364,20 +1353,6 @@ abstract class ShowElementCombinator implements NamespaceCombinator {
13641353
List<String> get shownNames;
13651354
}
13661355

1367-
/// A super formal parameter defined within a constructor element.
1368-
///
1369-
/// Clients may not extend, implement or mix-in this class.
1370-
@Deprecated('Use SuperFormalParameterElement2 instead')
1371-
abstract class SuperFormalParameterElement implements ParameterElement {
1372-
/// The associated super-constructor parameter, from the super-constructor
1373-
/// that is referenced by the implicit or explicit super-constructor
1374-
/// invocation.
1375-
///
1376-
/// Can be `null` for erroneous code - not existing super-constructor,
1377-
/// no corresponding parameter in the super-constructor.
1378-
ParameterElement? get superConstructorParameter;
1379-
}
1380-
13811356
/// An element that defines a type.
13821357
///
13831358
/// Clients may not extend, implement or mix-in this class.

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4288,11 +4288,9 @@ class FieldFormalParameterElementImpl2 extends FormalParameterElementImpl
42884288
}
42894289

42904290
abstract class FieldFormalParameterElementOrMember
4291-
implements
4292-
ParameterElementMixin,
4293-
// ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
4294-
FieldFormalParameterElement {
4295-
@override
4291+
implements ParameterElementMixin {
4292+
/// The field element associated with this field formal parameter, or `null`
4293+
/// if the parameter references a field that doesn't exist.
42964294
FieldElementOrMember? get field;
42974295
}
42984296

@@ -9953,10 +9951,15 @@ class SuperFormalParameterElementImpl2 extends FormalParameterElementImpl
99539951
}
99549952

99559953
abstract class SuperFormalParameterElementOrMember
9956-
implements
9957-
ParameterElementMixin,
9958-
// ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
9959-
SuperFormalParameterElement {}
9954+
implements ParameterElementMixin {
9955+
/// The associated super-constructor parameter, from the super-constructor
9956+
/// that is referenced by the implicit or explicit super-constructor
9957+
/// invocation.
9958+
///
9959+
/// Can be `null` for erroneous code - not existing super-constructor,
9960+
/// no corresponding parameter in the super-constructor.
9961+
ParameterElementMixin? get superConstructorParameter;
9962+
}
99609963

99619964
class TopLevelFunctionElementImpl extends ExecutableElementImpl2
99629965
with

0 commit comments

Comments
 (0)