Skip to content

Commit d82c467

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Rename to VariableFragment.initializer
Change-Id: I00e27d560d2b5aaa87db89626c5679aa04b2065a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411083 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 11ab2df commit d82c467

25 files changed

+713
-713
lines changed

‎pkg/analyzer/api.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4297,8 +4297,8 @@ package:analyzer/dart/element/element2.dart:
42974297
computeConstantValue (method: DartObject? Function())
42984298
VariableFragment (class extends Object implements Fragment):
42994299
new (constructor: VariableFragment Function())
4300-
constantInitializer2 (getter: Expression?)
43014300
element (getter: VariableElement2)
4301+
initializer (getter: Expression?)
43024302
nextFragment (getter: VariableFragment?)
43034303
previousFragment (getter: VariableFragment?)
43044304
package:analyzer/dart/element/nullability_suffix.dart:

‎pkg/analyzer/lib/dart/element/element2.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2887,15 +2887,15 @@ abstract class VariableElement2 implements Element2 {
28872887
///
28882888
/// Clients may not extend, implement or mix-in this class.
28892889
abstract class VariableFragment implements Fragment {
2890-
/// The constant initializer for this constant variable fragment, or the
2891-
/// default value for this formal parameter fragment.
2890+
@override
2891+
VariableElement2 get element;
2892+
2893+
/// The initializer for this constant variable fragment, or the default value
2894+
/// for this formal parameter fragment.
28922895
///
28932896
/// Is `null` if this variable fragment is not a constant, or does not have
28942897
/// the initializer or the default value specified.
2895-
Expression? get constantInitializer2;
2896-
2897-
@override
2898-
VariableElement2 get element;
2898+
Expression? get initializer;
28992899

29002900
@override
29012901
VariableFragment? get nextFragment;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11827,11 +11827,6 @@ abstract class VariableElementImpl extends ElementImpl
1182711827
/// initializers.
1182811828
ExpressionImpl? get constantInitializer => null;
1182911829

11830-
@override
11831-
ExpressionImpl? get constantInitializer2 {
11832-
return constantInitializer;
11833-
}
11834-
1183511830
@override
1183611831
VariableElement get declaration => this;
1183711832

@@ -11863,6 +11858,11 @@ abstract class VariableElementImpl extends ElementImpl
1186311858
setModifier(Modifier.IMPLICIT_TYPE, hasImplicitType);
1186411859
}
1186511860

11861+
@override
11862+
ExpressionImpl? get initializer {
11863+
return constantInitializer;
11864+
}
11865+
1186611866
/// Set whether this variable is abstract.
1186711867
set isAbstract(bool isAbstract) {
1186811868
setModifier(Modifier.ABSTRACT, isAbstract);
@@ -11938,7 +11938,7 @@ abstract class VariableElementImpl2 extends ElementImpl2
1193811938
}
1193911939

1194011940
for (var fragment in fragments.reversed) {
11941-
if (fragment.constantInitializer2 case ExpressionImpl expression) {
11941+
if (fragment.initializer case ExpressionImpl expression) {
1194211942
return _constantInitializer = ConstantInitializerImpl(
1194311943
fragment: fragment as VariableElementImpl,
1194411944
expression: expression,

‎pkg/analyzer/test/src/summary/element_text.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ class _Element2Writer extends _AbstractElementWriter {
636636
// _writeTypeInferenceError(f);
637637
// _writeType('type', f.type);
638638
// _writeShouldUseTypeForInitializerInference(f);
639-
_writeVariableFragmentConstantInitializer(f);
639+
_writeVariableFragmentInitializer(f);
640640
// _writeNonSyntheticElement(f);
641641
// writeLinking();
642642
_writeFragmentReference('previousFragment', f.previousFragment);
@@ -753,7 +753,7 @@ class _Element2Writer extends _AbstractElementWriter {
753753
// _writeCodeRange(f);
754754
// _writeTypeParameterElements(e.typeParameters);
755755
// _writeFragmentList('parameters', f, f.parameters2, _writeFormalParameterFragments);
756-
_writeVariableFragmentConstantInitializer(f);
756+
_writeVariableFragmentInitializer(f);
757757
// _writeNonSyntheticElement(e);
758758
// _writeFieldFormalParameterField(e);
759759
// _writeSuperConstructorParameter(e);
@@ -1696,7 +1696,7 @@ class _Element2Writer extends _AbstractElementWriter {
16961696
// _writeTypeInferenceError(f);
16971697
// _writeType('type', f.type);
16981698
// _writeShouldUseTypeForInitializerInference(f);
1699-
_writeVariableFragmentConstantInitializer(f);
1699+
_writeVariableFragmentInitializer(f);
17001700
// _writeNonSyntheticElement(f);
17011701
// writeLinking();
17021702
_writeFragmentReference('previousFragment', f.previousFragment);
@@ -1856,9 +1856,9 @@ class _Element2Writer extends _AbstractElementWriter {
18561856
}
18571857
}
18581858

1859-
void _writeVariableFragmentConstantInitializer(VariableFragment f) {
1860-
if (f.constantInitializer2 case var initializer?) {
1861-
_writeConstantInitializerExpression('constantInitializer', initializer);
1859+
void _writeVariableFragmentInitializer(VariableFragment f) {
1860+
if (f.initializer case var initializer?) {
1861+
_writeConstantInitializerExpression('initializer', initializer);
18621862
}
18631863
}
18641864
}

‎pkg/analyzer/test/src/summary/elements/class_test.dart‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,7 @@ library
21062106
default this.x @25
21072107
reference: <testLibraryFragment>::@class::C::@constructor::new::@parameter::x
21082108
element: <testLibraryFragment>::@class::C::@constructor::new::@parameter::x#element
2109-
constantInitializer: expression_0
2109+
initializer: expression_0
21102110
IntegerLiteral
21112111
literal: 42 @28
21122112
staticType: int
@@ -2322,7 +2322,7 @@ library
23222322
formalParameters
23232323
default this.x @25
23242324
element: <testLibraryFragment>::@class::C::@constructor::new::@parameter::x#element
2325-
constantInitializer: expression_0
2325+
initializer: expression_0
23262326
IntegerLiteral
23272327
literal: 42 @29
23282328
staticType: int
@@ -2918,7 +2918,7 @@ library
29182918
formalParameters
29192919
default f @41
29202920
element: <testLibraryFragment>::@class::A::@constructor::new::@parameter::f#element
2921-
constantInitializer: expression_0
2921+
initializer: expression_0
29222922
IntegerLiteral
29232923
literal: 0 @45
29242924
staticType: int
@@ -5034,7 +5034,7 @@ library
50345034
default a @19
50355035
reference: <testLibraryFragment>::@class::A::@constructor::new::@parameter::a
50365036
element: <testLibraryFragment>::@class::A::@constructor::new::@parameter::a#element
5037-
constantInitializer: expression_0
5037+
initializer: expression_0
50385038
IntegerLiteral
50395039
literal: 0 @23
50405040
staticType: int
@@ -5619,7 +5619,7 @@ library
56195619
default a @19
56205620
reference: <testLibraryFragment>::@class::A::@constructor::new::@parameter::a
56215621
element: <testLibraryFragment>::@class::A::@constructor::new::@parameter::a#element
5622-
constantInitializer: expression_0
5622+
initializer: expression_0
56235623
IntegerLiteral
56245624
literal: 0 @23
56255625
staticType: int
@@ -10539,7 +10539,7 @@ library
1053910539
hasInitializer i @27
1054010540
reference: <testLibraryFragment>::@class::C::@field::i
1054110541
element: <testLibraryFragment>::@class::C::@field::i#element
10542-
constantInitializer: expression_0
10542+
initializer: expression_0
1054310543
IntegerLiteral
1054410544
literal: 0 @31
1054510545
staticType: int
@@ -10621,7 +10621,7 @@ library
1062110621
hasInitializer i @32
1062210622
reference: <testLibraryFragment>::@class::C::@field::i
1062310623
element: <testLibraryFragment>::@class::C::@field::i#element
10624-
constantInitializer: expression_0
10624+
initializer: expression_0
1062510625
IntegerLiteral
1062610626
literal: 0 @36
1062710627
staticType: int
@@ -11287,7 +11287,7 @@ library
1128711287
hasInitializer x @18
1128811288
reference: <testLibraryFragment>::@class::C::@field::x
1128911289
element: <testLibraryFragment>::@class::C::@field::x#element
11290-
constantInitializer: expression_0
11290+
initializer: expression_0
1129111291
IntegerLiteral
1129211292
literal: 42 @22
1129311293
staticType: int
@@ -11443,7 +11443,7 @@ library
1144311443
hasInitializer f @46
1144411444
reference: <testLibraryFragment>::@class::B::@field::f
1144511445
element: <testLibraryFragment>::@class::B::@field::f#element
11446-
constantInitializer: expression_0
11446+
initializer: expression_0
1144711447
InstanceCreationExpression
1144811448
keyword: const @50
1144911449
constructorName: ConstructorName
@@ -12503,7 +12503,7 @@ library
1250312503
hasInitializer f @107
1250412504
reference: <testLibraryFragment>::@class::B::@field::f
1250512505
element: <testLibraryFragment>::@class::B::@field::f#element
12506-
constantInitializer: expression_0
12506+
initializer: expression_0
1250712507
ListLiteral
1250812508
leftBracket: [ @111
1250912509
elements
@@ -12530,7 +12530,7 @@ library
1253012530
hasInitializer a @6
1253112531
reference: <testLibraryFragment>::@topLevelVariable::a
1253212532
element: <testLibrary>::@topLevelVariable::a
12533-
constantInitializer: expression_1
12533+
initializer: expression_1
1253412534
IntegerLiteral
1253512535
literal: 0 @10
1253612536
staticType: int
@@ -12772,7 +12772,7 @@ library
1277212772
hasInitializer foo @93
1277312773
reference: <testLibraryFragment>::@class::B::@field::foo
1277412774
element: <testLibraryFragment>::@class::B::@field::foo#element
12775-
constantInitializer: expression_0
12775+
initializer: expression_0
1277612776
IntegerLiteral
1277712777
literal: 2 @99
1277812778
staticType: double
@@ -15213,7 +15213,7 @@ library
1521315213
hasInitializer x @25
1521415214
reference: <testLibraryFragment>::@class::C::@field::x
1521515215
element: <testLibraryFragment>::@class::C::@field::x#element
15216-
constantInitializer: expression_0
15216+
initializer: expression_0
1521715217
IntegerLiteral
1521815218
literal: 0 @29
1521915219
staticType: int
@@ -27990,7 +27990,7 @@ library
2799027990
element: <testLibraryFragment>::@class::A::@constructor::c2::@parameter::b#element
2799127991
default c @52
2799227992
element: <testLibraryFragment>::@class::A::@constructor::c2::@parameter::c#element
27993-
constantInitializer: expression_0
27993+
initializer: expression_0
2799427994
IntegerLiteral
2799527995
literal: 0 @56
2799627996
staticType: int
@@ -28009,7 +28009,7 @@ library
2800928009
default c @88
2801028010
reference: <testLibraryFragment>::@class::A::@constructor::c3::@parameter::c
2801128011
element: <testLibraryFragment>::@class::A::@constructor::c3::@parameter::c#element
28012-
constantInitializer: expression_1
28012+
initializer: expression_1
2801328013
IntegerLiteral
2801428014
literal: 0 @92
2801528015
staticType: int
@@ -28056,7 +28056,7 @@ library
2805628056
element: <testLibraryFragment>::@class::C::@constructor::c2::@parameter::b#element
2805728057
default c
2805828058
element: <testLibraryFragment>::@class::C::@constructor::c2::@parameter::c#element
28059-
constantInitializer: expression_0
28059+
initializer: expression_0
2806028060
constantInitializers
2806128061
SuperConstructorInvocation
2806228062
superKeyword: super @0
@@ -28101,7 +28101,7 @@ library
2810128101
default c
2810228102
reference: <testLibraryFragment>::@class::C::@constructor::c3::@parameter::c
2810328103
element: <testLibraryFragment>::@class::C::@constructor::c3::@parameter::c#element
28104-
constantInitializer: expression_1
28104+
initializer: expression_1
2810528105
constantInitializers
2810628106
SuperConstructorInvocation
2810728107
superKeyword: super @0
@@ -30248,7 +30248,7 @@ library
3024830248
formalParameters
3024930249
default x
3025030250
element: <testLibraryFragment>::@class::MixinApp::@constructor::positionalArg::@parameter::x#element
30251-
constantInitializer: expression_0
30251+
initializer: expression_0
3025230252
BooleanLiteral
3025330253
literal: true @127
3025430254
staticType: bool
@@ -30280,7 +30280,7 @@ library
3028030280
formalParameters
3028130281
default x
3028230282
element: <testLibraryFragment>::@class::MixinApp::@constructor::positionalArg2::@parameter::x#element
30283-
constantInitializer: expression_1
30283+
initializer: expression_1
3028430284
BooleanLiteral
3028530285
literal: true @167
3028630286
staticType: bool
@@ -30313,7 +30313,7 @@ library
3031330313
default x
3031430314
reference: <testLibraryFragment>::@class::MixinApp::@constructor::namedArg::@parameter::x
3031530315
element: <testLibraryFragment>::@class::MixinApp::@constructor::namedArg::@parameter::x#element
30316-
constantInitializer: expression_2
30316+
initializer: expression_2
3031730317
IntegerLiteral
3031830318
literal: 42 @200
3031930319
staticType: int
@@ -30346,7 +30346,7 @@ library
3034630346
default x
3034730347
reference: <testLibraryFragment>::@class::MixinApp::@constructor::namedArg2::@parameter::x
3034830348
element: <testLibraryFragment>::@class::MixinApp::@constructor::namedArg2::@parameter::x#element
30349-
constantInitializer: expression_3
30349+
initializer: expression_3
3035030350
BooleanLiteral
3035130351
literal: true @233
3035230352
staticType: bool
@@ -31234,7 +31234,7 @@ library
3123431234
hasInitializer x @61
3123531235
reference: <testLibraryFragment>::@topLevelVariable::x
3123631236
element: <testLibrary>::@topLevelVariable::x
31237-
constantInitializer: expression_0
31237+
initializer: expression_0
3123831238
InstanceCreationExpression
3123931239
constructorName: ConstructorName
3124031240
type: NamedType
@@ -31876,7 +31876,7 @@ library
3187631876
hasInitializer foo @58
3187731877
reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
3187831878
element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo#element
31879-
constantInitializer: expression_0
31879+
initializer: expression_0
3188031880
IntegerLiteral
3188131881
literal: 0 @64
3188231882
staticType: int
@@ -31999,7 +31999,7 @@ library
3199931999
hasInitializer foo @58
3200032000
reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
3200132001
element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo#element
32002-
constantInitializer: expression_0
32002+
initializer: expression_0
3200332003
IntegerLiteral
3200432004
literal: 0 @64
3200532005
staticType: int
@@ -32125,7 +32125,7 @@ library
3212532125
hasInitializer foo @51
3212632126
reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo
3212732127
element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo#element
32128-
constantInitializer: expression_0
32128+
initializer: expression_0
3212932129
IntegerLiteral
3213032130
literal: 0 @57
3213132131
staticType: int
@@ -35015,7 +35015,7 @@ library
3501535015
hasInitializer foo @44
3501635016
reference: <testLibraryFragment>::@class::A::@field::foo
3501735017
element: <testLibraryFragment>::@class::A::@field::foo#element
35018-
constantInitializer: expression_0
35018+
initializer: expression_0
3501935019
IntegerLiteral
3502035020
literal: 0 @50
3502135021
staticType: int
@@ -35043,7 +35043,7 @@ library
3504335043
augment hasInitializer foo @67
3504435044
reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
3504535045
element: <testLibraryFragment>::@class::A::@field::foo#element
35046-
constantInitializer: expression_1
35046+
initializer: expression_1
3504735047
AugmentedInvocation
3504835048
augmentedKeyword: augmented @73
3504935049
arguments: ArgumentList
@@ -35339,7 +35339,7 @@ library
3533935339
hasInitializer foo @37
3534035340
reference: <testLibraryFragment>::@class::A::@field::foo
3534135341
element: <testLibraryFragment>::@class::A::@field::foo#element
35342-
constantInitializer: expression_0
35342+
initializer: expression_0
3534335343
IntegerLiteral
3534435344
literal: 0 @43
3534535345
staticType: int
@@ -35368,7 +35368,7 @@ library
3536835368
augment hasInitializer foo @59
3536935369
reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@fieldAugmentation::foo
3537035370
element: <testLibraryFragment>::@class::A::@field::foo#element
35371-
constantInitializer: expression_1
35371+
initializer: expression_1
3537235372
BinaryExpression
3537335373
leftOperand: AugmentedExpression
3537435374
augmentedKeyword: augmented @65
@@ -39451,7 +39451,7 @@ library
3945139451
formalParameters
3945239452
default x @55
3945339453
element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::foo::@parameter::x#element
39454-
constantInitializer: expression_0
39454+
initializer: expression_0
3945539455
IntegerLiteral
3945639456
literal: 42 @59
3945739457
staticType: int

0 commit comments

Comments
 (0)