Skip to content

Commit 6321756

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Rename Reference.element2 to element.
Change-Id: I613e48e8df803ceed19871e2724dccbe5ea34859 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435720 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 98a1b63 commit 6321756

File tree

7 files changed

+42
-43
lines changed

7 files changed

+42
-43
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ class AnalysisDriver {
892892
if (_pendingFileChanges.isEmpty) {
893893
var rootReference = libraryContext.elementFactory.rootReference;
894894
var reference = rootReference.getChild('$uriObj');
895-
var element = reference.element2;
895+
var element = reference.element;
896896
if (element is LibraryElementImpl) {
897897
return LibraryElementResultImpl(element);
898898
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
160160
final ClassFragmentImpl _firstFragment;
161161

162162
ClassElementImpl(this.reference, this._firstFragment) {
163-
reference.element2 = this;
163+
reference.element = this;
164164
firstFragment.augmentedInternal = this;
165165
}
166166

@@ -791,7 +791,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
791791
required this.reference,
792792
required this.firstFragment,
793793
}) {
794-
reference.element2 = this;
794+
reference.element = this;
795795
firstFragment.element = this;
796796
}
797797

@@ -2187,7 +2187,7 @@ class EnumElementImpl extends InterfaceElementImpl implements EnumElement {
21872187
final EnumFragmentImpl firstFragment;
21882188

21892189
EnumElementImpl(this.reference, this.firstFragment) {
2190-
reference.element2 = this;
2190+
reference.element = this;
21912191
firstFragment.augmentedInternal = this;
21922192
}
21932193

@@ -2643,7 +2643,7 @@ class ExtensionElementImpl extends InstanceElementImpl
26432643
TypeImpl _extendedType = InvalidTypeImpl.instance;
26442644

26452645
ExtensionElementImpl(this.reference, this.firstFragment) {
2646-
reference.element2 = this;
2646+
reference.element = this;
26472647
firstFragment.augmentedInternal = this;
26482648
}
26492649

@@ -2759,7 +2759,7 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
27592759
final ExtensionTypeFragmentImpl firstFragment;
27602760

27612761
ExtensionTypeElementImpl(this.reference, this.firstFragment) {
2762-
reference.element2 = this;
2762+
reference.element = this;
27632763
firstFragment.augmentedInternal = this;
27642764
}
27652765

@@ -2898,7 +2898,7 @@ class FieldElementImpl extends PropertyInducingElementImpl
28982898
final FieldFragmentImpl firstFragment;
28992899

29002900
FieldElementImpl({required this.reference, required this.firstFragment}) {
2901-
reference.element2 = this;
2901+
reference.element = this;
29022902
firstFragment.element = this;
29032903
}
29042904

@@ -4471,7 +4471,7 @@ class GetterElementImpl extends PropertyAccessorElementImpl
44714471
final GetterFragmentImpl firstFragment;
44724472

44734473
GetterElementImpl(this.reference, this.firstFragment) {
4474-
reference.element2 = this;
4474+
reference.element = this;
44754475
GetterFragmentImpl? fragment = firstFragment;
44764476
while (fragment != null) {
44774477
fragment.element = this;
@@ -7746,7 +7746,7 @@ class MethodElementImpl extends ExecutableElementImpl
77467746
required this.reference,
77477747
required this.firstFragment,
77487748
}) {
7749-
reference.element2 = this;
7749+
reference.element = this;
77507750
firstFragment.element = this;
77517751
}
77527752

@@ -7919,7 +7919,7 @@ class MixinElementImpl extends InterfaceElementImpl implements MixinElement {
79197919
final MixinFragmentImpl firstFragment;
79207920

79217921
MixinElementImpl(this.reference, this.firstFragment) {
7922-
reference.element2 = this;
7922+
reference.element = this;
79237923
firstFragment.augmentedInternal = this;
79247924
}
79257925

@@ -8715,7 +8715,7 @@ class PrefixElementImpl extends ElementImpl implements PrefixElement {
87158715

87168716
PrefixElementImpl({required this.reference, required this.firstFragment})
87178717
: lastFragment = firstFragment {
8718-
reference.element2 = this;
8718+
reference.element = this;
87198719
}
87208720

87218721
@override
@@ -9441,7 +9441,7 @@ class SetterElementImpl extends PropertyAccessorElementImpl
94419441
final SetterFragmentImpl firstFragment;
94429442

94439443
SetterElementImpl(this.reference, this.firstFragment) {
9444-
reference.element2 = this;
9444+
reference.element = this;
94459445
SetterFragmentImpl? fragment = firstFragment;
94469446
while (fragment != null) {
94479447
fragment.element = this;
@@ -9726,7 +9726,7 @@ class TopLevelFunctionElementImpl extends ExecutableElementImpl
97269726
final TopLevelFunctionFragmentImpl firstFragment;
97279727

97289728
TopLevelFunctionElementImpl(this.reference, this.firstFragment) {
9729-
reference.element2 = this;
9729+
reference.element = this;
97309730
firstFragment.element = this;
97319731
}
97329732

@@ -9831,7 +9831,7 @@ class TopLevelVariableElementImpl extends PropertyInducingElementImpl
98319831
final TopLevelVariableFragmentImpl firstFragment;
98329832

98339833
TopLevelVariableElementImpl(this.reference, this.firstFragment) {
9834-
reference.element2 = this;
9834+
reference.element = this;
98359835
firstFragment.element = this;
98369836
}
98379837

@@ -9971,7 +9971,7 @@ class TypeAliasElementImpl extends TypeDefiningElementImpl
99719971
final TypeAliasFragmentImpl firstFragment;
99729972

99739973
TypeAliasElementImpl(this.reference, this.firstFragment) {
9974-
reference.element2 = this;
9974+
reference.element = this;
99759975
firstFragment.element = this;
99769976
}
99779977

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ class InheritanceManager3 {
11451145
var elementReference = class_.element.reference!
11461146
.getChild('@method')
11471147
.getChild(fragmentName);
1148-
if (elementReference.element2 case MethodElementImpl result) {
1148+
if (elementReference.element case MethodElementImpl result) {
11491149
return result.firstFragment;
11501150
}
11511151

@@ -1171,7 +1171,7 @@ class InheritanceManager3 {
11711171
var setterReference = class_.element.reference!
11721172
.getChild('@setter')
11731173
.getChild(fragmentName);
1174-
if (setterReference.element2 case SetterElementImpl result) {
1174+
if (setterReference.element case SetterElementImpl result) {
11751175
return result.firstFragment;
11761176
}
11771177

@@ -1191,7 +1191,7 @@ class InheritanceManager3 {
11911191
var fieldReference = class_.element.reference!
11921192
.getChild('@field')
11931193
.getChild(elementName);
1194-
assert(fieldReference.element2 == null);
1194+
assert(fieldReference.element == null);
11951195
FieldElementImpl(reference: fieldReference, firstFragment: resultField);
11961196

11971197
resultField.type = executable.parameters[0].type;
@@ -1237,7 +1237,7 @@ class InheritanceManager3 {
12371237
var elementReference = targetClass.element.reference!
12381238
.getChild('@method')
12391239
.getChild(fragmentName);
1240-
if (elementReference.element2 case SetterElementImpl result) {
1240+
if (elementReference.element case SetterElementImpl result) {
12411241
return result.firstFragment;
12421242
}
12431243

@@ -1269,7 +1269,7 @@ class InheritanceManager3 {
12691269
var elementReference = targetClass.element.reference!
12701270
.getChild('@getter')
12711271
.getChild(fragmentName);
1272-
if (elementReference.element2 case GetterElementImpl result) {
1272+
if (elementReference.element case GetterElementImpl result) {
12731273
return result.firstFragment;
12741274
}
12751275

@@ -1282,7 +1282,7 @@ class InheritanceManager3 {
12821282
var elementReference = targetClass.element.reference!
12831283
.getChild('@setter')
12841284
.getChild(fragmentName);
1285-
if (elementReference.element2 case SetterElementImpl result) {
1285+
if (elementReference.element case SetterElementImpl result) {
12861286
return result.firstFragment;
12871287
}
12881288

@@ -1305,7 +1305,7 @@ class InheritanceManager3 {
13051305
var elementReference = targetClass.element.reference!
13061306
.getChild('@field')
13071307
.getChild(elementName);
1308-
assert(elementReference.element2 == null);
1308+
assert(elementReference.element == null);
13091309
var fieldElement = FieldElementImpl(
13101310
reference: elementReference,
13111311
firstFragment: field,

‎pkg/analyzer/lib/src/summary2/bundle_reader.dart

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class LibraryReader {
150150
0,
151151
featureSet,
152152
);
153-
_reference.element2 = _libraryElement;
153+
_reference.element = _libraryElement;
154154
_libraryElement.reference = _reference;
155155

156156
// Read the rest of non-resolution data for the library.
@@ -251,8 +251,8 @@ class LibraryReader {
251251
/// These elements are implicitly declared in `dart:core`.
252252
void _declareDartCoreDynamicNever() {
253253
if (_reference.name == 'dart:core') {
254-
_reference.getChild('dynamic').element2 = DynamicElementImpl.instance;
255-
_reference.getChild('Never').element2 = NeverElementImpl.instance;
254+
_reference.getChild('dynamic').element = DynamicElementImpl.instance;
255+
_reference.getChild('Never').element = NeverElementImpl.instance;
256256
}
257257
}
258258

@@ -896,7 +896,7 @@ class LibraryReader {
896896
isDeferred: isDeferred,
897897
);
898898

899-
var element = reference.element2 as PrefixElementImpl?;
899+
var element = reference.element as PrefixElementImpl?;
900900
if (element == null) {
901901
element = PrefixElementImpl(
902902
reference: reference,
@@ -1492,16 +1492,16 @@ class LibraryReader {
14921492

14931493
void _readVariableGetterSetterLinking() {
14941494
_reader.readTypedList(() {
1495-
var variable = _readReference().element2 as PropertyInducingElementImpl;
1495+
var variable = _readReference().element as PropertyInducingElementImpl;
14961496

1497-
var optionalGetter = _readOptionalReference()?.element2;
1497+
var optionalGetter = _readOptionalReference()?.element;
14981498
if (optionalGetter != null) {
14991499
var getter = optionalGetter as GetterElementImpl;
15001500
variable.getter2 = getter;
15011501
getter.variable3 = variable;
15021502
}
15031503

1504-
var optionalSetter = _readOptionalReference()?.element2;
1504+
var optionalSetter = _readOptionalReference()?.element;
15051505
if (optionalSetter != null) {
15061506
var setter = optionalSetter as SetterElementImpl;
15071507
variable.setter2 = setter;
@@ -1614,7 +1614,6 @@ class ResolutionReader {
16141614
return _reader.readEnum(values);
16151615
}
16161616

1617-
16181617
Map<K, V> readMap<K, V>({
16191618
required K Function() readKey,
16201619
required V Function() readValue,

‎pkg/analyzer/lib/src/summary2/library_builder.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ class LibraryBuilder {
630630
.getChild('${libraryFragment.source.uri}')
631631
.getChild('@prefix2')
632632
.getChild(refName);
633-
var element = reference.element2 as PrefixElementImpl?;
633+
var element = reference.element as PrefixElementImpl?;
634634

635635
if (element == null) {
636636
element = PrefixElementImpl(
@@ -729,11 +729,11 @@ class LibraryBuilder {
729729
void _declareDartCoreDynamicNever() {
730730
if (reference.name == 'dart:core') {
731731
var dynamicRef = reference.getChild('dynamic');
732-
dynamicRef.element2 = DynamicElementImpl.instance;
732+
dynamicRef.element = DynamicElementImpl.instance;
733733
declare(DynamicElementImpl.instance, dynamicRef);
734734

735735
var neverRef = reference.getChild('Never');
736-
neverRef.element2 = NeverElementImpl.instance;
736+
neverRef.element = NeverElementImpl.instance;
737737
declare(NeverElementImpl.instance, neverRef);
738738
}
739739
}
@@ -780,7 +780,7 @@ class LibraryBuilder {
780780
libraryElement.isSynthetic = !libraryFile.exists;
781781
libraryElement.languageVersion = libraryUnitNode.languageVersion;
782782
libraryElement.reference = libraryReference;
783-
libraryReference.element2 = libraryElement;
783+
libraryReference.element = libraryElement;
784784

785785
var linkingUnits = <LinkingUnit>[];
786786
{

‎pkg/analyzer/lib/src/summary2/linked_element_factory.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class LinkedElementFactory {
6262
@visibleForTesting
6363
List<Uri> get uriListWithLibraryElements {
6464
return rootReference.children
65-
.map((reference) => reference.element2)
65+
.map((reference) => reference.element)
6666
.whereType<LibraryElementImpl>()
6767
.map((e) => e.uri)
6868
.toList();
@@ -145,7 +145,7 @@ class LinkedElementFactory {
145145
// During linking we create libraries when typeProvider is not ready.
146146
// Update these libraries now, when typeProvider is ready.
147147
for (var reference in rootReference.children) {
148-
var libraryElement = reference.element2 as LibraryElementImpl?;
148+
var libraryElement = reference.element as LibraryElementImpl?;
149149
if (libraryElement != null && !libraryElement.hasTypeProviderSystemSet) {
150150
setLibraryTypeSystem(libraryElement);
151151
}
@@ -154,12 +154,12 @@ class LinkedElementFactory {
154154

155155
void dispose() {
156156
for (var libraryReference in rootReference.children) {
157-
_disposeLibrary(libraryReference.element2);
157+
_disposeLibrary(libraryReference.element);
158158
}
159159
}
160160

161161
Element elementOfReference3(Reference reference) {
162-
if (reference.element2 case var element?) {
162+
if (reference.element case var element?) {
163163
return element;
164164
}
165165

@@ -179,7 +179,7 @@ class LinkedElementFactory {
179179
parentElement.constructors;
180180
}
181181

182-
var element = reference.element2;
182+
var element = reference.element;
183183
if (element == null) {
184184
throw StateError('Expected existing element: $reference');
185185
}
@@ -188,7 +188,7 @@ class LinkedElementFactory {
188188

189189
LibraryElementImpl? libraryOfUri(Uri uri) {
190190
var reference = rootReference.getChild('$uri');
191-
if (reference.element2 case LibraryElementImpl element) {
191+
if (reference.element case LibraryElementImpl element) {
192192
return element;
193193
}
194194
return createLibraryElementForReading(uri);
@@ -217,7 +217,7 @@ class LinkedElementFactory {
217217
_libraryReaders.remove(uri);
218218
libraryManifests.remove(uri);
219219
var libraryReference = rootReference.removeChild('$uri');
220-
_disposeLibrary(libraryReference?.element2);
220+
_disposeLibrary(libraryReference?.element);
221221
}
222222

223223
analysisSession.classHierarchy.removeOfLibraries(uriSet);
@@ -249,7 +249,7 @@ class LinkedElementFactory {
249249
void replaceAnalysisSession(AnalysisSessionImpl newSession) {
250250
analysisSession = newSession;
251251
for (var libraryReference in rootReference.children) {
252-
var libraryElement = libraryReference.element2;
252+
var libraryElement = libraryReference.element;
253253
if (libraryElement is LibraryElementImpl) {
254254
libraryElement.session = newSession;
255255
}

‎pkg/analyzer/lib/src/summary2/reference.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Reference {
3535
String name;
3636

3737
/// The corresponding [ElementImpl], or `null` if a named container.
38-
ElementImpl? element2;
38+
ElementImpl? element;
3939

4040
/// Temporary index used during serialization and linking.
4141
int? index;

0 commit comments

Comments
 (0)