Skip to content

Commit 78bc6da

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Deprecate InstanceElement.xyz2, use 'xyz' instead.
Change-Id: Ie12b7596b70c77fd2f08520a423eeaf3b6978326 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428880 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 146f362 commit 78bc6da

File tree

67 files changed

+530
-388
lines changed

Some content is hidden

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

67 files changed

+530
-388
lines changed

‎pkg/analysis_server/lib/src/cider/local_library_contributor.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class LibraryElementSuggestionBuilder
223223
var contextType = request.contextType;
224224
if (contextType is InterfaceType) {
225225
// TODO(scheglov): This looks not ideal - we should suggest getters.
226-
for (var field in element.fields2) {
226+
for (var field in element.fields) {
227227
if (field.isStatic &&
228228
field.isAccessibleIn2(request.libraryElement) &&
229229
typeSystem.isSubtypeOf(field.type, contextType)) {

‎pkg/analysis_server/lib/src/computer/computer_overrides.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,21 +227,21 @@ class _OverriddenElementsFinder {
227227

228228
// method
229229
if (_kinds.contains(ElementKind.METHOD)) {
230-
var member = findMatchingElement(classElement.methods2);
230+
var member = findMatchingElement(classElement.methods);
231231
if (member != null) {
232232
return member;
233233
}
234234
}
235235
// getter
236236
if (_kinds.contains(ElementKind.GETTER)) {
237-
var member = findMatchingElement(classElement.getters2);
237+
var member = findMatchingElement(classElement.getters);
238238
if (member != null) {
239239
return member;
240240
}
241241
}
242242
// setter
243243
if (_kinds.contains(ElementKind.SETTER)) {
244-
var member = findMatchingElement(classElement.setters2);
244+
var member = findMatchingElement(classElement.setters);
245245
if (member != null) {
246246
return member;
247247
}

‎pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ class ImplementedComputer {
6565
// Always include Object and its members.
6666
if (element is ClassElement && element.isDartCoreObject) {
6767
_addImplementedClass(element);
68-
element.getters2.forEach(_addImplementedMember);
69-
element.setters2.forEach(_addImplementedMember);
70-
element.fields2.forEach(_addImplementedMember);
71-
element.methods2.forEach(_addImplementedMember);
68+
element.getters.forEach(_addImplementedMember);
69+
element.setters.forEach(_addImplementedMember);
70+
element.fields.forEach(_addImplementedMember);
71+
element.methods.forEach(_addImplementedMember);
7272
return;
7373
}
7474

7575
// Analyze subtypes.
7676
subtypeMembers = await searchEngine.membersOfSubtypes(element);
7777
if (subtypeMembers != null) {
7878
_addImplementedClass(element);
79-
element.getters2.forEach(_addMemberIfImplemented);
80-
element.setters2.forEach(_addMemberIfImplemented);
81-
element.fields2.forEach(_addMemberIfImplemented);
82-
element.methods2.forEach(_addMemberIfImplemented);
79+
element.getters.forEach(_addMemberIfImplemented);
80+
element.setters.forEach(_addMemberIfImplemented);
81+
element.fields.forEach(_addMemberIfImplemented);
82+
element.methods.forEach(_addMemberIfImplemented);
8383
}
8484
}
8585

‎pkg/analysis_server/lib/src/search/type_hierarchy.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,15 @@ class TypeHierarchyComputerHelper {
216216
ExecutableElement? result;
217217
// try to find in the class itself
218218
if (pivotKind == ElementKind.METHOD) {
219-
result = clazz.getMethod2(pivotName);
219+
result = clazz.getMethod(pivotName);
220220
} else if (pivotKind == ElementKind.GETTER) {
221-
result = clazz.getGetter2(pivotName);
221+
result = clazz.getGetter(pivotName);
222222
} else if (pivotKind == ElementKind.SETTER) {
223-
result = clazz.getSetter2(pivotName);
223+
result = clazz.getSetter(pivotName);
224224
} else if (pivotKind == ElementKind.FIELD) {
225-
result = clazz.getGetter2(pivotName);
225+
result = clazz.getGetter(pivotName);
226226
if (result == null && !pivotFieldFinal) {
227-
result = clazz.getSetter2(pivotName);
227+
result = clazz.getSetter(pivotName);
228228
}
229229
}
230230
if (result != null && result.isAccessibleIn2(pivotLibrary)) {
@@ -234,27 +234,27 @@ class TypeHierarchyComputerHelper {
234234
for (var mixin in clazz.mixins.reversed) {
235235
var mixinElement = mixin.element3;
236236
if (pivotKind == ElementKind.METHOD) {
237-
result = mixinElement.lookUpMethod2(
237+
result = mixinElement.lookUpMethod(
238238
name: pivotName,
239239
library: pivotLibrary,
240240
);
241241
} else if (pivotKind == ElementKind.GETTER) {
242-
result = mixinElement.lookUpGetter2(
242+
result = mixinElement.lookUpGetter(
243243
name: pivotName,
244244
library: pivotLibrary,
245245
);
246246
} else if (pivotKind == ElementKind.SETTER) {
247-
result = mixinElement.lookUpSetter2(
247+
result = mixinElement.lookUpSetter(
248248
name: pivotName,
249249
library: pivotLibrary,
250250
);
251251
} else if (pivotKind == ElementKind.FIELD) {
252-
result = mixinElement.lookUpGetter2(
252+
result = mixinElement.lookUpGetter(
253253
name: pivotName,
254254
library: pivotLibrary,
255255
);
256256
if (result == null && !pivotFieldFinal) {
257-
result = mixinElement.lookUpSetter2(
257+
result = mixinElement.lookUpSetter(
258258
name: pivotName,
259259
library: pivotLibrary,
260260
);

‎pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class DeclarationHelper {
265265
}
266266
fieldsToSkip.remove(fieldToInclude);
267267

268-
for (var field in containingElement.fields2) {
268+
for (var field in containingElement.fields) {
269269
// Skip fields that are already initialized at their declaration.
270270
if (!field.isStatic &&
271271
!field.isSynthetic &&
@@ -441,7 +441,7 @@ class DeclarationHelper {
441441
var referencingInterface =
442442
(extendedType is InterfaceType) ? extendedType.element3 : null;
443443
if (includeMethods) {
444-
for (var method in extension.methods2) {
444+
for (var method in extension.methods) {
445445
if (!method.isStatic) {
446446
if (method.isOperator) {
447447
continue;
@@ -454,7 +454,7 @@ class DeclarationHelper {
454454
}
455455
}
456456
}
457-
for (var accessor in extension.getters2) {
457+
for (var accessor in extension.getters) {
458458
if (excludedGetters.contains(accessor.name3)) {
459459
continue;
460460
}
@@ -467,7 +467,7 @@ class DeclarationHelper {
467467
}
468468
}
469469
if (includeSetters) {
470-
for (var accessor in extension.setters2) {
470+
for (var accessor in extension.setters) {
471471
if (!accessor.isStatic) {
472472
_suggestProperty(
473473
accessor: accessor,
@@ -636,30 +636,30 @@ class DeclarationHelper {
636636
switch (element) {
637637
case EnumElement():
638638
_addStaticMembers(
639-
getters: element.getters2,
640-
setters: element.setters2,
639+
getters: element.getters,
640+
setters: element.setters,
641641
constructors: element.constructors2,
642642
containingElement: element,
643-
fields: element.fields2,
644-
methods: element.methods2,
643+
fields: element.fields,
644+
methods: element.methods,
645645
);
646646
case ExtensionElement():
647647
_addStaticMembers(
648-
getters: element.getters2,
649-
setters: element.setters2,
648+
getters: element.getters,
649+
setters: element.setters,
650650
constructors: const [],
651651
containingElement: element,
652-
fields: element.fields2,
653-
methods: element.methods2,
652+
fields: element.fields,
653+
methods: element.methods,
654654
);
655655
case InterfaceElement():
656656
_addStaticMembers(
657-
getters: element.getters2,
658-
setters: element.setters2,
657+
getters: element.getters,
658+
setters: element.setters,
659659
constructors: element.constructors2,
660660
containingElement: element,
661-
fields: element.fields2,
662-
methods: element.methods2,
661+
fields: element.fields,
662+
methods: element.methods,
663663
);
664664
}
665665
}
@@ -780,7 +780,7 @@ class DeclarationHelper {
780780
for (var instantiatedExtension in applicableExtensions) {
781781
var extension = instantiatedExtension.extension;
782782
if (includeMethods) {
783-
for (var method in extension.methods2) {
783+
for (var method in extension.methods) {
784784
if (!method.isStatic) {
785785
if (method.isOperator) {
786786
continue;
@@ -789,7 +789,7 @@ class DeclarationHelper {
789789
}
790790
}
791791
}
792-
for (var getter in extension.getters2) {
792+
for (var getter in extension.getters) {
793793
if (excludedGetters.contains(getter.name3)) {
794794
continue;
795795
}
@@ -803,7 +803,7 @@ class DeclarationHelper {
803803
}
804804
}
805805
}
806-
for (var setter in extension.setters2) {
806+
for (var setter in extension.setters) {
807807
if (!setter.isSynthetic) {
808808
if (includeSetters) {
809809
_suggestProperty(accessor: setter);
@@ -1271,7 +1271,7 @@ class DeclarationHelper {
12711271
void _addMembersOfEnclosingInstance(InstanceElement element) {
12721272
var referencingInterface = _referencingInterfaceFor(element);
12731273

1274-
for (var accessor in element.getters2) {
1274+
for (var accessor in element.getters) {
12751275
if (!accessor.isSynthetic && (!mustBeStatic || accessor.isStatic)) {
12761276
_suggestProperty(
12771277
accessor: accessor,
@@ -1281,7 +1281,7 @@ class DeclarationHelper {
12811281
}
12821282
}
12831283

1284-
for (var accessor in element.setters2) {
1284+
for (var accessor in element.setters) {
12851285
if (!accessor.isSynthetic && (!mustBeStatic || accessor.isStatic)) {
12861286
_suggestProperty(
12871287
accessor: accessor,
@@ -1291,7 +1291,7 @@ class DeclarationHelper {
12911291
}
12921292
}
12931293

1294-
for (var field in element.fields2) {
1294+
for (var field in element.fields) {
12951295
if (!field.isSynthetic && (!mustBeStatic || field.isStatic)) {
12961296
_suggestField(
12971297
field: field,
@@ -1301,7 +1301,7 @@ class DeclarationHelper {
13011301
}
13021302
}
13031303

1304-
for (var method in element.methods2) {
1304+
for (var method in element.methods) {
13051305
if (!mustBeStatic || method.isStatic) {
13061306
_suggestMethod(
13071307
method: method,
@@ -1690,7 +1690,7 @@ class DeclarationHelper {
16901690
}
16911691
}
16921692
if (!mustBeType) {
1693-
_suggestStaticFields(element.fields2, importData);
1693+
_suggestStaticFields(element.fields, importData);
16941694
_suggestConstructors(
16951695
element.constructors2,
16961696
importData,
@@ -1795,7 +1795,7 @@ class DeclarationHelper {
17951795
}
17961796

17971797
if (!mustBeType) {
1798-
_suggestStaticFields(element.fields2, importData);
1798+
_suggestStaticFields(element.fields, importData);
17991799
_suggestConstructors(
18001800
element.constructors2,
18011801
importData,
@@ -1825,7 +1825,7 @@ class DeclarationHelper {
18251825
collector.addSuggestion(suggestion);
18261826
}
18271827
if (!mustBeType) {
1828-
_suggestStaticFields(element.fields2, importData);
1828+
_suggestStaticFields(element.fields, importData);
18291829
}
18301830
}
18311831
}
@@ -1849,7 +1849,7 @@ class DeclarationHelper {
18491849
collector.addSuggestion(suggestion);
18501850
}
18511851
if (!mustBeType) {
1852-
_suggestStaticFields(element.fields2, importData);
1852+
_suggestStaticFields(element.fields, importData);
18531853
_suggestConstructors(element.constructors2, importData);
18541854
}
18551855
}
@@ -1984,7 +1984,7 @@ class DeclarationHelper {
19841984
collector.addSuggestion(suggestion);
19851985
}
19861986
if (!mustBeType) {
1987-
_suggestStaticFields(element.fields2, importData);
1987+
_suggestStaticFields(element.fields, importData);
19881988
}
19891989
}
19901990
}

‎pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
4747
var enumElement = expressionType.element3;
4848
if (enumElement is EnumElement) {
4949
enumName = enumElement.name3;
50-
for (var field in enumElement.fields2) {
50+
for (var field in enumElement.fields) {
5151
if (field.isEnumConstant) {
5252
unhandledEnumCases.addIfNotNull(field.name3);
5353
}

‎pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class AddMissingEnumLikeCaseClauses extends ResolvedCorrectionProducer {
104104
List<String> _constantNames(InterfaceElement classElement) {
105105
var type = classElement.thisType;
106106
var constantNames = <String>[];
107-
for (var field in classElement.fields2) {
107+
for (var field in classElement.fields) {
108108
// Ensure static const.
109109
if (field.isSynthetic || !field.isConst || !field.isStatic) {
110110
continue;

‎pkg/analysis_server/lib/src/services/correction/dart/use_different_division_operator.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ extension on DartType {
134134
switch (element3) {
135135
case InterfaceElement element:
136136
return {
137-
for (var method in element.methods2)
137+
for (var method in element.methods)
138138
// No need to test for eq operators, as they are not explicitly defined.
139139
if (method.name3 == TokenType.SLASH.lexeme)
140140
_DivisionOperator.division

‎pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class _WidgetDescriptionComputer {
403403
List<protocol.FlutterWidgetPropertyValueEnumItem> _enumItemsForEnum(
404404
EnumElement element,
405405
) {
406-
return element.fields2
406+
return element.fields
407407
.where((field) => field.isStatic && field.isEnumConstant)
408408
.map(_toEnumItem)
409409
.toList();
@@ -412,7 +412,7 @@ class _WidgetDescriptionComputer {
412412
List<protocol.FlutterWidgetPropertyValueEnumItem> _enumItemsForStaticFields(
413413
ClassElement classElement,
414414
) {
415-
return classElement.fields2
415+
return classElement.fields
416416
.where((f) => f.isStatic)
417417
.map(_toEnumItem)
418418
.toList();

‎pkg/analysis_server/lib/src/utilities/import_analyzer.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,22 +224,22 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
224224
var extensionElement = node.declaredFragment?.element;
225225
if (extensionElement != null) {
226226
recorder.recordDeclaration(node.offset, extensionElement);
227-
for (var getter in extensionElement.getters2) {
227+
for (var getter in extensionElement.getters) {
228228
if (!getter.isStatic && !getter.isSynthetic) {
229229
recorder.recordDeclaration(node.offset, getter);
230230
}
231231
}
232-
for (var setter in extensionElement.setters2) {
232+
for (var setter in extensionElement.setters) {
233233
if (!setter.isStatic && !setter.isSynthetic) {
234234
recorder.recordDeclaration(node.offset, setter);
235235
}
236236
}
237-
for (var field in extensionElement.fields2) {
237+
for (var field in extensionElement.fields) {
238238
if (!field.isStatic && !field.isSynthetic) {
239239
recorder.recordDeclaration(node.offset, field);
240240
}
241241
}
242-
for (var method in extensionElement.methods2) {
242+
for (var method in extensionElement.methods) {
243243
if (!method.isStatic) {
244244
recorder.recordDeclaration(node.offset, method);
245245
}

0 commit comments

Comments
 (0)