Skip to content

Commit f16cd98

Browse files
srawlinsCommit Queue
authored andcommitted
DAS: Deprecate CorrectionProducer.inheritanceManager
Change-Id: Id1772d47617a98ffc15d700a9bd7de58a04d745e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/430020 Reviewed-by: Keerti Parthasarathy <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 0d0cac4 commit f16cd98

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

pkg/analysis_server/lib/src/services/correction/dart/create_method.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,12 @@ class CreateMethod extends ResolvedCorrectionProducer {
6969
ExecutableElement? element;
7070
if (missingEquals) {
7171
_memberName = '==';
72-
element = inheritanceManager.getInherited4(
73-
classElement,
72+
element = classElement.getInheritedMember(
7473
Name.forLibrary(classElement.library2, _memberName),
7574
);
7675
} else {
7776
_memberName = 'hashCode';
78-
element = inheritanceManager.getInherited4(
79-
classElement,
77+
element = classElement.getInheritedMember(
8078
Name.forLibrary(classElement.library2, _memberName),
8179
);
8280
}

pkg/analysis_server/lib/src/services/correction/dart/encapsulate_field.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,15 @@ class EncapsulateField extends ResolvedCorrectionProducer {
144144
}
145145

146146
// Write getter.
147-
var overriddenGetters = inheritanceManager.getOverridden4(
148-
parentElement,
149-
Name(null, name),
150-
);
147+
var overriddenGetters = parentElement.getOverridden(Name(null, name));
151148
writeHeader(overriddenGetters != null);
152149
builder.write(' ${typeCode}get $name => _$name;');
153150

154151
// Write setter.
155152
if (variableList.isFinal) {
156153
return;
157154
}
158-
var overriddenSetters = inheritanceManager.getOverridden4(
159-
parentElement,
155+
var overriddenSetters = parentElement.getOverridden(
160156
Name(null, '$name='),
161157
);
162158
writeHeader(overriddenSetters != null);

pkg/analysis_server/lib/src/services/correction/dart/rename_method_parameter.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ class RenameMethodParameter extends ResolvedCorrectionProducer {
5050
var classElement = declaredFragment?.element;
5151
if (classElement is! InterfaceElement) return;
5252

53-
var parentMethod = inheritanceManager.getInherited4(
54-
classElement,
53+
var parentMethod = classElement.getInheritedMember(
5554
Name.forLibrary(libraryElement2, method.name.lexeme),
5655
);
5756
if (parentMethod == null) return;

pkg/analysis_server_plugin/api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ package:analysis_server_plugin/edit/dart/correction_producer.dart:
8585
new (constructor: ResolvedCorrectionProducer Function({required CorrectionProducerContext context}))
8686
analysisOptions (getter: AnalysisOptions)
8787
inStaticContext (getter: bool)
88-
inheritanceManager (getter: InheritanceManager3)
88+
inheritanceManager (getter: InheritanceManager3, deprecated)
8989
libraryElement2 (getter: LibraryElement)
9090
libraryResult (getter: ResolvedLibraryResult)
9191
typeProvider (getter: TypeProvider)

pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ abstract class ResolvedCorrectionProducer
377377
AnalysisOptions get analysisOptions => sessionHelper.session.analysisContext
378378
.getAnalysisOptionsForFile(unitResult.file);
379379

380+
@Deprecated('Use InterfaceElement members instead')
380381
InheritanceManager3 get inheritanceManager {
381382
return (libraryElement2 as LibraryElementImpl).session.inheritanceManager;
382383
}

0 commit comments

Comments
 (0)