Skip to content

Commit e9b8dd9

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Rename all Xyz2OrMember into InternalXyzElement.
First, the character `2` has no meaning anymore. Second, saying "Internal" better represents what this interface is: an internal interface, with more precise types and additional methods. Move InternalConstructorElement into 'with' in ConstructorElementImpl. Change-Id: I22b04b4b6e786c50429359a656a8d6ca5e2fb492 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442701 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent 1cf0dea commit e9b8dd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+581
-598
lines changed

‎pkg/analyzer/lib/src/dart/analysis/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
884884
void visitDotShorthandPropertyAccess(DotShorthandPropertyAccess node) {
885885
IndexRelationKind kind;
886886
var element = node.propertyName.element;
887-
if (element is ConstructorElementMixin2) {
887+
if (element is InternalConstructorElement) {
888888
element = _getActualConstructorElement(element);
889889
kind = IndexRelationKind.IS_REFERENCED_BY_CONSTRUCTOR_TEAR_OFF;
890890
} else {

‎pkg/analyzer/lib/src/dart/ast/ast.dart‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ final class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
531531
/// The list must be the same length as the number of arguments, but can
532532
/// contain `null` entries if a given argument doesn't correspond to a formal
533533
/// parameter.
534-
List<FormalParameterElementMixin?>? _correspondingStaticParameters;
534+
List<InternalFormalParameterElement?>? _correspondingStaticParameters;
535535

536536
@generated
537537
ArgumentListImpl({
@@ -548,11 +548,11 @@ final class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
548548
return leftParenthesis;
549549
}
550550

551-
List<FormalParameterElementMixin?>? get correspondingStaticParameters =>
551+
List<InternalFormalParameterElement?>? get correspondingStaticParameters =>
552552
_correspondingStaticParameters;
553553

554554
set correspondingStaticParameters(
555-
List<FormalParameterElementMixin?>? parameters,
555+
List<InternalFormalParameterElement?>? parameters,
556556
) {
557557
if (parameters != null && parameters.length != arguments.length) {
558558
throw ArgumentError(
@@ -604,7 +604,7 @@ final class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
604604
/// - the function being invoked is known based on static type information
605605
/// - the expression corresponds to one of the parameters of the function
606606
/// being invoked
607-
FormalParameterElementMixin? _getStaticParameterElementFor(
607+
InternalFormalParameterElement? _getStaticParameterElementFor(
608608
Expression expression,
609609
) {
610610
if (_correspondingStaticParameters == null ||
@@ -1151,7 +1151,7 @@ final class AssignmentExpressionImpl extends ExpressionImpl
11511151
ExpressionImpl _rightHandSide;
11521152

11531153
@override
1154-
MethodElement2OrMember? element;
1154+
InternalMethodElement? element;
11551155

11561156
@generated
11571157
AssignmentExpressionImpl({
@@ -1211,7 +1211,7 @@ final class AssignmentExpressionImpl extends ExpressionImpl
12111211
/// The parameter element representing the parameter to which the value of the
12121212
/// right operand is bound, or `null` if the AST structure is not resolved or
12131213
/// the function being invoked is not known based on static type information.
1214-
FormalParameterElementMixin? get _staticParameterElementForRightHandSide {
1214+
InternalFormalParameterElement? get _staticParameterElementForRightHandSide {
12151215
Element? executableElement;
12161216
if (operator.type != TokenType.EQ) {
12171217
executableElement = element;
@@ -1226,10 +1226,10 @@ final class AssignmentExpressionImpl extends ExpressionImpl
12261226
}
12271227
if (operator.type == TokenType.EQ && leftHandSide is IndexExpression) {
12281228
return formalParameters.length == 2
1229-
? (formalParameters[1] as FormalParameterElementMixin)
1229+
? (formalParameters[1] as InternalFormalParameterElement)
12301230
: null;
12311231
}
1232-
return formalParameters[0] as FormalParameterElementMixin;
1232+
return formalParameters[0] as InternalFormalParameterElement;
12331233
}
12341234

12351235
return null;
@@ -5514,7 +5514,7 @@ final class ConstructorNameImpl extends AstNodeImpl implements ConstructorName {
55145514
SimpleIdentifierImpl? _name;
55155515

55165516
@override
5517-
ConstructorElementMixin2? element;
5517+
InternalConstructorElement? element;
55185518

55195519
@generated
55205520
ConstructorNameImpl({
@@ -6749,7 +6749,7 @@ final class DotShorthandConstructorInvocationImpl
67496749
@override
67506750
bool get canBeConst {
67516751
var element = constructorName.element;
6752-
if (element is! ConstructorElementMixin2) return false;
6752+
if (element is! InternalConstructorElement) return false;
67536753
if (!element.isConst) return false;
67546754

67556755
// Ensure that dependencies (e.g. default parameter values) are computed.
@@ -7520,7 +7520,7 @@ final class EnumConstantDeclarationImpl extends DeclarationImpl
75207520
FieldFragmentImpl? declaredFragment;
75217521

75227522
@override
7523-
ConstructorElementMixin2? constructorElement;
7523+
InternalConstructorElement? constructorElement;
75247524

75257525
@generated
75267526
EnumConstantDeclarationImpl({
@@ -7544,7 +7544,7 @@ final class EnumConstantDeclarationImpl extends DeclarationImpl
75447544

75457545
@Deprecated('Use constructorElement instead')
75467546
@override
7547-
ConstructorElementMixin2? get constructorElement2 => constructorElement;
7547+
InternalConstructorElement? get constructorElement2 => constructorElement;
75487548

75497549
@generated
75507550
@override
@@ -8171,7 +8171,7 @@ sealed class ExpressionImpl extends CollectionElementImpl
81718171

81728172
@experimental
81738173
@override
8174-
FormalParameterElementMixin? get correspondingParameter {
8174+
InternalFormalParameterElement? get correspondingParameter {
81758175
var parent = this.parent;
81768176
if (parent is ArgumentListImpl) {
81778177
return parent._getStaticParameterElementFor(this);
@@ -13934,15 +13934,15 @@ final class IndexExpressionImpl extends ExpressionImpl
1393413934
/// index expression is bound, or `null` if the AST structure is not resolved,
1393513935
/// or the function being invoked is not known based on static type
1393613936
/// information.
13937-
FormalParameterElementMixin? get _staticParameterElementForIndex {
13937+
InternalFormalParameterElement? get _staticParameterElementForIndex {
1393813938
Element? element = this.element;
1393913939

1394013940
var parent = this.parent;
1394113941
if (parent is CompoundAssignmentExpression) {
1394213942
element = parent.writeElement ?? parent.readElement;
1394313943
}
1394413944

13945-
if (element is ExecutableElement2OrMember) {
13945+
if (element is InternalExecutableElement) {
1394613946
var formalParameters = element.formalParameters;
1394713947
if (formalParameters.isEmpty) {
1394813948
return null;
@@ -17078,14 +17078,14 @@ final class NamedExpressionImpl extends ExpressionImpl
1707817078

1707917079
@experimental
1708017080
@override
17081-
FormalParameterElementMixin? get element {
17081+
InternalFormalParameterElement? get element {
1708217082
return _name.label.element?.ifTypeOrNull();
1708317083
}
1708417084

1708517085
@Deprecated('Use element instead')
1708617086
@experimental
1708717087
@override
17088-
FormalParameterElementMixin? get element2 {
17088+
InternalFormalParameterElement? get element2 {
1708917089
return element;
1709017090
}
1709117091

@@ -19558,7 +19558,7 @@ final class PostfixExpressionImpl extends ExpressionImpl
1955819558
/// The parameter element representing the parameter to which the value of the
1955919559
/// operand is bound, or `null` ff the AST structure is not resolved or the
1956019560
/// function being invoked isn't known based on static type information.
19561-
FormalParameterElementMixin? get _staticParameterElementForOperand {
19561+
InternalFormalParameterElement? get _staticParameterElementForOperand {
1956219562
if (element == null) {
1956319563
return null;
1956419564
}
@@ -19568,7 +19568,7 @@ final class PostfixExpressionImpl extends ExpressionImpl
1956819568
}
1956919569
// TODO(paulberry): eliminate this cast by changing the type of
1957019570
// `staticElement` to `MethodElement2OrMember?`.
19571-
return parameters[0] as FormalParameterElementMixin;
19571+
return parameters[0] as InternalFormalParameterElement;
1957219572
}
1957319573

1957419574
@generated
@@ -19832,7 +19832,7 @@ final class PrefixExpressionImpl extends ExpressionImpl
1983219832
/// The parameter element representing the parameter to which the value of the
1983319833
/// operand is bound, or `null` if the AST structure is not resolved or the
1983419834
/// function being invoked isn't known based on static type information.
19835-
FormalParameterElementMixin? get _staticParameterElementForOperand {
19835+
InternalFormalParameterElement? get _staticParameterElementForOperand {
1983619836
if (element == null) {
1983719837
return null;
1983819838
}
@@ -19842,7 +19842,7 @@ final class PrefixExpressionImpl extends ExpressionImpl
1984219842
}
1984319843
// TODO(paulberry): eliminate this cast by changing the type of
1984419844
// `staticElement` to `MethodElementOrMember?`.
19845-
return parameters[0] as FormalParameterElementMixin;
19845+
return parameters[0] as InternalFormalParameterElement;
1984619846
}
1984719847

1984819848
@generated
@@ -22783,7 +22783,7 @@ final class SuperConstructorInvocationImpl extends ConstructorInitializerImpl
2278322783
ArgumentListImpl _argumentList;
2278422784

2278522785
@override
22786-
ConstructorElementMixin2? element;
22786+
InternalConstructorElement? element;
2278722787

2278822788
@generated
2278922789
SuperConstructorInvocationImpl({

‎pkg/analyzer/lib/src/dart/constant/constant_verifier.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
211211
) {
212212
if (node.isConst) {
213213
var constructor = node.constructorName.element;
214-
if (constructor is ConstructorElementMixin2) {
214+
if (constructor is InternalConstructorElement) {
215215
_validateConstructorInvocation(node, constructor, node.argumentList);
216216
}
217217
} else {
@@ -911,7 +911,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
911911
/// arguments are constant expressions.
912912
void _validateConstructorInvocation(
913913
AstNode node,
914-
ConstructorElementMixin2 constructor,
914+
InternalConstructorElement constructor,
915915
ArgumentList argumentList,
916916
) {
917917
var constantVisitor = ConstantVisitor(

‎pkg/analyzer/lib/src/dart/constant/evaluation.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class ConstantEvaluationEngine {
183183
// ignore it here.
184184
constant.evaluationResult = null;
185185
}
186-
} else if (element is ConstructorElementMixin2 &&
186+
} else if (element is InternalConstructorElement &&
187187
element.isConst &&
188188
constNode.arguments != null) {
189189
var diagnosticListener = RecordingDiagnosticListener();
@@ -249,7 +249,7 @@ class ConstantEvaluationEngine {
249249
}
250250

251251
ReferenceFinder referenceFinder = ReferenceFinder(callback);
252-
if (constant case ConstructorElementMixin2 constructor) {
252+
if (constant case InternalConstructorElement constructor) {
253253
constant = constructor.baseElement;
254254
}
255255

@@ -353,7 +353,7 @@ class ConstantEvaluationEngine {
353353
AstNode node,
354354
List<TypeImpl>? typeArguments,
355355
List<Expression> arguments,
356-
ConstructorElementMixin2 constructor,
356+
InternalConstructorElement constructor,
357357
ConstantVisitor constantVisitor, {
358358
ConstructorInvocationImpl? invocation,
359359
}) {
@@ -402,7 +402,7 @@ class ConstantEvaluationEngine {
402402
AstNode node,
403403
List<TypeImpl>? typeArguments,
404404
List<Expression> arguments,
405-
ConstructorElementMixin2 constructor,
405+
InternalConstructorElement constructor,
406406
ConstantVisitor constantVisitor, {
407407
ConstructorInvocationImpl? invocation,
408408
}) {
@@ -462,8 +462,8 @@ class ConstantEvaluationEngine {
462462

463463
/// If [constructor] redirects to another const constructor, return the
464464
/// const constructor it redirects to. Otherwise return `null`.
465-
static ConstructorElementMixin2? getConstRedirectedConstructor(
466-
ConstructorElementMixin2 constructor,
465+
static InternalConstructorElement? getConstRedirectedConstructor(
466+
InternalConstructorElement constructor,
467467
) {
468468
if (!constructor.isFactory) {
469469
return null;
@@ -881,7 +881,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
881881
return InvalidConstant.genericError(node: node);
882882
}
883883
var constructor = node.constructorName.element;
884-
if (constructor is ConstructorElementMixin2) {
884+
if (constructor is InternalConstructorElement) {
885885
return _evaluationEngine.evaluateAndFormatErrorsInConstructorCall(
886886
_library,
887887
node,
@@ -2137,7 +2137,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
21372137
DartObjectImpl value,
21382138
) {
21392139
var functionElement = value.toFunctionValue();
2140-
if (functionElement is! ExecutableElement2OrMember) {
2140+
if (functionElement is! InternalExecutableElement) {
21412141
return value;
21422142
}
21432143
var valueType = functionElement.type;
@@ -2172,7 +2172,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
21722172
// TODO(srawlins): When all code uses [FunctionReference]s generated via
21732173
// generic function instantiation, remove this method and all call sites.
21742174
var functionElement = value.toFunctionValue();
2175-
if (functionElement is! ExecutableElement2OrMember) {
2175+
if (functionElement is! InternalExecutableElement) {
21762176
return value;
21772177
}
21782178
var valueType = functionElement.type;
@@ -2837,7 +2837,7 @@ class _InstanceCreationEvaluator {
28372837
/// The node used for most error reporting.
28382838
final AstNode _errorNode;
28392839

2840-
final ConstructorElementMixin2 _constructor;
2840+
final InternalConstructorElement _constructor;
28412841

28422842
final List<TypeImpl>? _typeArguments;
28432843

@@ -3535,8 +3535,8 @@ class _InstanceCreationEvaluator {
35353535
/// Returns a context message that mimics a stack trace where [superConstructor] is
35363536
/// called by [constructor]
35373537
DiagnosticMessageImpl _stackTraceContextMessage(
3538-
ConstructorElementMixin2 superConstructor,
3539-
ConstructorElementMixin2 constructor,
3538+
InternalConstructorElement superConstructor,
3539+
InternalConstructorElement constructor,
35403540
) {
35413541
return DiagnosticMessageImpl(
35423542
filePath: constructor.firstFragment.libraryFragment.source.fullName,
@@ -3556,7 +3556,7 @@ class _InstanceCreationEvaluator {
35563556
DeclaredVariables declaredVariables,
35573557
LibraryElementImpl library,
35583558
AstNode node,
3559-
ConstructorElementMixin2 constructor,
3559+
InternalConstructorElement constructor,
35603560
List<TypeImpl>? typeArguments,
35613561
List<Expression> arguments,
35623562
ConstantVisitor constantVisitor, {
@@ -3662,10 +3662,10 @@ class _InstanceCreationEvaluator {
36623662
/// chain terminates. If there is a problem (e.g. a redirection can't be
36633663
/// found, or a cycle is encountered), the chain will be followed as far as
36643664
/// possible and then a const factory constructor will be returned.
3665-
static ConstructorElementMixin2 _followConstantRedirectionChain(
3666-
ConstructorElementMixin2 constructor,
3665+
static InternalConstructorElement _followConstantRedirectionChain(
3666+
InternalConstructorElement constructor,
36673667
) {
3668-
var constructorsVisited = <ConstructorElementMixin2>{};
3668+
var constructorsVisited = <InternalConstructorElement>{};
36693669
while (true) {
36703670
var redirectedConstructor =
36713671
ConstantEvaluationEngine.getConstRedirectedConstructor(constructor);

‎pkg/analyzer/lib/src/dart/constant/value.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ class DartObjectImpl implements DartObject, Constant {
944944
}
945945

946946
@override
947-
ExecutableElement2OrMember? toFunctionValue() {
947+
InternalExecutableElement? toFunctionValue() {
948948
var state = this.state;
949949
return state is FunctionState ? state.element : null;
950950
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ElementDisplayStringBuilder {
6767
_writeTypesIfNotEmpty(' implements ', element.interfaces);
6868
}
6969

70-
void writeConstructorElement(ConstructorElementMixin2 element) {
70+
void writeConstructorElement(InternalConstructorElement element) {
7171
_writeType(element.returnType);
7272

7373
var displayName = element.name ?? '<null-name>';
@@ -98,7 +98,7 @@ class ElementDisplayStringBuilder {
9898
_writeTypesIfNotEmpty(' implements ', element.interfaces);
9999
}
100100

101-
void writeExecutableElement(ExecutableElement2OrMember element, String name) {
101+
void writeExecutableElement(InternalExecutableElement element, String name) {
102102
if (element.kind != ElementKind.SETTER) {
103103
_writeType(element.returnType);
104104
_write(' ');
@@ -139,7 +139,7 @@ class ElementDisplayStringBuilder {
139139
_writeTypesIfNotEmpty(' implements ', element.interfaces);
140140
}
141141

142-
void writeFormalParameterElement(FormalParameterElementMixin element) {
142+
void writeFormalParameterElement(InternalFormalParameterElement element) {
143143
if (element.isRequiredPositional) {
144144
_writeWithoutDelimiters(element, forElement: true);
145145
} else if (element.isOptionalPositional) {
@@ -367,7 +367,7 @@ class ElementDisplayStringBuilder {
367367
_write('_');
368368
}
369369

370-
void writeVariableElement(VariableElement2OrMember element) {
370+
void writeVariableElement(InternalVariableElement element) {
371371
_writeType(element.type);
372372
_write(' ${element.displayName}');
373373
}
@@ -401,7 +401,7 @@ class ElementDisplayStringBuilder {
401401
}
402402

403403
void _writeFormalParameters(
404-
List<FormalParameterElementMixin> parameters, {
404+
List<InternalFormalParameterElement> parameters, {
405405
required bool forElement,
406406
bool allowMultiline = false,
407407
}) {
@@ -527,7 +527,7 @@ class ElementDisplayStringBuilder {
527527
}
528528

529529
void _writeWithoutDelimiters(
530-
FormalParameterElementMixin element, {
530+
InternalFormalParameterElement element, {
531531
required bool forElement,
532532
}) {
533533
if (element.isRequiredNamed) {

0 commit comments

Comments
 (0)