Skip to content

Commit 013c134

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Rename XyzMember into SubstitutedXyzElementImpl.
New names better represent what these classes are. The `element_printer.dart` utility is updated to produce the old `*Member` names for the new `Substituted*ElementImpl` classes. This is a temporary measure to avoid updating a large number of test expectations in this CL. The expectations will be updated and the temporary code in `element_printer.dart` will be removed in a follow-up CL. Change-Id: Ic203600d6c1a0b686323df8bd2f8f086769309ae Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442721 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent e9b8dd9 commit 013c134

22 files changed

+539
-420
lines changed

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,10 @@ class DeclarationHelper {
11311131
continue;
11321132
}
11331133
// Exclude static methods when completion on an instance.
1134-
var member = ExecutableMember.from(rawMember, substitution);
1134+
var member = SubstitutedExecutableElementImpl.from(
1135+
rawMember,
1136+
substitution,
1137+
);
11351138
_suggestMethod(
11361139
method: member as MethodElement,
11371140
referencingInterface: referencingInterface,
@@ -1141,7 +1144,10 @@ class DeclarationHelper {
11411144
}
11421145
} else if (rawMember is GetterElement) {
11431146
if (!excludedGetters.contains(entry.key)) {
1144-
var member = ExecutableMember.from(rawMember, substitution);
1147+
var member = SubstitutedExecutableElementImpl.from(
1148+
rawMember,
1149+
substitution,
1150+
);
11451151
_suggestProperty(
11461152
accessor: member as PropertyAccessorElement,
11471153
referencingInterface: referencingInterface,
@@ -1151,7 +1157,10 @@ class DeclarationHelper {
11511157
}
11521158
} else if (rawMember is SetterElement) {
11531159
if (includeSetters) {
1154-
var member = ExecutableMember.from(rawMember, substitution);
1160+
var member = SubstitutedExecutableElementImpl.from(
1161+
rawMember,
1162+
substitution,
1163+
);
11551164
_suggestProperty(
11561165
accessor: member as PropertyAccessorElement,
11571166
referencingInterface: referencingInterface,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,15 +568,15 @@ abstract class DirectiveUriWithUnit extends DirectiveUriWithSource {
568568
///
569569
/// Clients may not extend, implement or mix-in this class.
570570
abstract class Element {
571-
/// The non-[Member] version of this element.
571+
/// The non-[SubstitutedElementImpl] version of this element.
572572
///
573573
/// If the receiver is a view on an element, such as a method from an
574574
/// interface type with substituted type parameters, this getter will return
575575
/// the corresponding element from the class, without any substitutions.
576576
///
577-
/// If the receiver is already a non-[Member] element (or a synthetic element,
578-
/// such as a synthetic property accessor), this getter will return the
579-
/// receiver.
577+
/// If the receiver is already a non-[SubstitutedElementImpl] element (or a
578+
/// synthetic element, such as a synthetic property accessor), this getter
579+
/// will return the receiver.
580580
Element get baseElement;
581581

582582
/// The children of this element.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3221,7 +3221,10 @@ class _InstanceCreationEvaluator {
32213221
var baseElement = initializer.element;
32223222
if (baseElement != null && baseElement.isConst) {
32233223
// Instantiate the constructor with the in-scope type arguments.
3224-
var constructor = ConstructorMember.from2(baseElement, definingType);
3224+
var constructor = SubstitutedConstructorElementImpl.from2(
3225+
baseElement,
3226+
definingType,
3227+
);
32253228
var result = _evaluationEngine.evaluateConstructorCall(
32263229
_library,
32273230
_errorNode,

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class InheritanceManager3 {
256256
}
257257

258258
var substitution = Substitution.fromInterfaceType(type);
259-
return ExecutableMember.from(rawElement, substitution);
259+
return SubstitutedExecutableElementImpl.from(rawElement, substitution);
260260
}
261261

262262
/// Return all members of mixins, superclasses, and interfaces that a member
@@ -287,7 +287,10 @@ class InheritanceManager3 {
287287
var name = entry.key;
288288
var candidate = entry.value;
289289

290-
candidate = ExecutableMember.from(candidate, substitution);
290+
candidate = SubstitutedExecutableElementImpl.from(
291+
candidate,
292+
substitution,
293+
);
291294

292295
var candidates = namedCandidates[name];
293296
if (candidates == null) {
@@ -336,7 +339,10 @@ class InheritanceManager3 {
336339
continue;
337340
}
338341

339-
executable = ExecutableMember.from(executable, substitution);
342+
executable = SubstitutedExecutableElementImpl.from(
343+
executable,
344+
substitution,
345+
);
340346

341347
implemented[entry.key] = executable;
342348
}
@@ -497,7 +503,10 @@ class InheritanceManager3 {
497503

498504
for (var entry in superTypeInterface.implemented.entries) {
499505
var executable = entry.value;
500-
executable = ExecutableMember.from(executable, substitution);
506+
executable = SubstitutedExecutableElementImpl.from(
507+
executable,
508+
substitution,
509+
);
501510
implemented[entry.key] = executable;
502511
}
503512

@@ -530,7 +539,10 @@ class InheritanceManager3 {
530539
var mixinConflicts = <Conflict>[];
531540
for (var entry in mixinInterface.map.entries) {
532541
var name = entry.key;
533-
var candidate = ExecutableMember.from(entry.value, substitution);
542+
var candidate = SubstitutedExecutableElementImpl.from(
543+
entry.value,
544+
substitution,
545+
);
534546

535547
var currentList = namedCandidates[name];
536548
if (currentList == null) {
@@ -694,7 +706,10 @@ class InheritanceManager3 {
694706
var substitution = Substitution.fromInterfaceType(interface);
695707
for (var entry in getInterface(interface.element).map.entries) {
696708
var name = entry.key;
697-
var executable = ExecutableMember.from(entry.value, substitution);
709+
var executable = SubstitutedExecutableElementImpl.from(
710+
entry.value,
711+
substitution,
712+
);
698713
if (executable.isExtensionTypeMember) {
699714
(extensionCandidates[name] ??= _ExtensionTypeCandidates(name)).add(
700715
executable,

0 commit comments

Comments
 (0)