Skip to content

Commit 183d0ad

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove a few v1 methods from InheritanceManager3.
Replace `getInheritedMap()` with v2 version. Remove `getMember()`, operations should go thought elements, not types. Remove `getMember2()`. Rename v2 `getMember4()` into `getMember()`. A few internal methods are duplicated for now, will be de-duplicated when migration of InheritanceManager3 is finished. For now I'd like to do smaller steps than migrating it fully. Change-Id: Ib5d9d28e91d77330e41480fcb7176f93d867728a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435663 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent c6abc1e commit 183d0ad

16 files changed

+468
-303
lines changed

pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class _SuperComputer {
117117
return null;
118118
}
119119

120-
var member = inheritanceManager.getInherited4(interfaceElement, name);
120+
var member = inheritanceManager.getInherited(interfaceElement, name);
121121
return _lastFragment(member);
122122
}
123123

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5323,14 +5323,14 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
53235323

53245324
@override
53255325
ExecutableElement? getInheritedMember(Name name) =>
5326-
(session as AnalysisSessionImpl).inheritanceManager.getInherited4(
5326+
(session as AnalysisSessionImpl).inheritanceManager.getInherited(
53275327
this,
53285328
name,
53295329
);
53305330

53315331
@override
53325332
ExecutableElement? getInterfaceMember(Name name) =>
5333-
(session as AnalysisSessionImpl).inheritanceManager.getMember4(
5333+
(session as AnalysisSessionImpl).inheritanceManager.getMember(
53345334
this,
53355335
name,
53365336
);
@@ -5472,7 +5472,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
54725472
required LibraryElement library,
54735473
}) {
54745474
return inheritanceManager
5475-
.getInherited4(this, Name.forLibrary(library, methodName))
5475+
.getInherited(this, Name.forLibrary(library, methodName))
54765476
.ifTypeOrNull();
54775477
}
54785478

0 commit comments

Comments
 (0)