Skip to content

Commit c9a3dd7

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Use getLinkingNode2(Fragment)
Change-Id: I977e38bca5bc6393747ab5e51061423fbc572c32 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410880 Reviewed-by: Phil Quitslund <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 13f5fc6 commit c9a3dd7

File tree

9 files changed

+10
-16
lines changed

9 files changed

+10
-16
lines changed

pkg/analyzer/lib/src/summary2/constructor_initializer_resolver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ConstructorInitializerResolver {
3939
if (element.isSynthetic) return;
4040

4141
for (var fragment in element.fragments) {
42-
var node = _linker.getLinkingNode(fragment);
42+
var node = _linker.getLinkingNode2(fragment);
4343
if (node is! ConstructorDeclarationImpl) return;
4444

4545
var constructorScope = LinkingNodeContext.get(node).scope;

pkg/analyzer/lib/src/summary2/default_types_builder.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ class DefaultTypesBuilder {
274274
} else if (visited.add(startType.element3)) {
275275
void recurseParameters(List<TypeParameterElement2> parameters) {
276276
for (var parameter in parameters) {
277-
var parameterNode = _linker.getLinkingNode2(parameter);
277+
var parameterNode =
278+
_linker.getLinkingNode2(parameter.firstFragment);
278279
if (parameterNode is TypeParameter) {
279280
var bound = parameterNode.bound;
280281
if (bound != null) {

pkg/analyzer/lib/src/summary2/extension_type.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class _Node extends graph.Node<_Node> {
133133

134134
var dependencies = <_Node>[];
135135
for (var element in visitor.dependencies) {
136-
var declaration = walker.linker.getLinkingNode2(element);
136+
var declaration = walker.linker.getLinkingNode2(element.firstFragment);
137137
if (declaration is ExtensionTypeDeclarationImpl) {
138138
var node = walker.getNode(declaration);
139139
dependencies.add(node);

pkg/analyzer/lib/src/summary2/link.dart

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import 'package:analyzer/src/summary2/type_alias.dart';
2626
import 'package:analyzer/src/summary2/types_builder.dart';
2727
import 'package:analyzer/src/summary2/variance_builder.dart';
2828
import 'package:analyzer/src/util/performance/operation_performance.dart';
29-
import 'package:analyzer/src/utilities/extensions/element.dart';
3029
import 'package:analyzer/src/utilities/uri_cache.dart';
3130

3231
LinkResult link({
@@ -80,15 +79,9 @@ class Linker {
8079
return elementNodes[element];
8180
}
8281

83-
/// If the [element] is part of a library being linked, return the node
84-
/// from which it was created.
85-
ast.AstNode? getLinkingNode2(Element2 element) {
86-
return elementNodes[element.asElement];
87-
}
88-
8982
/// If the [fragment] is part of a library being linked, return the node
9083
/// from which it was created.
91-
ast.AstNode? getLinkingNode3(Fragment fragment) {
84+
ast.AstNode? getLinkingNode2(Fragment fragment) {
9285
return elementNodes[fragment];
9386
}
9487

pkg/analyzer/lib/src/summary2/named_type_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class NamedTypeBuilder extends TypeBuilder {
263263
}
264264

265265
DartType _getAliasedType(TypeAliasElementImpl2 element) {
266-
var typedefNode = linker.getLinkingNode2(element);
266+
var typedefNode = linker.getLinkingNode2(element.firstFragment);
267267

268268
// If the element is not being linked, the types have already been built.
269269
if (typedefNode == null) {

pkg/analyzer/lib/src/summary2/simply_bounded.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class SimplyBoundedDependencyWalker
9292
SimplyBoundedNode getNode(Element2 element) {
9393
var graphNode = nodeMap[element];
9494
if (graphNode == null) {
95-
var node = linker.getLinkingNode2(element);
95+
var node = linker.getLinkingNode2(element.firstFragment);
9696
if (node is ClassDeclaration) {
9797
var parameters = node.typeParameters?.typeParameters;
9898
graphNode = SimplyBoundedNode(

pkg/analyzer/lib/src/summary2/super_constructor_resolver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SuperConstructorResolver {
3939

4040
var invokesDefaultSuperConstructor = true;
4141
for (var fragment in element.fragments) {
42-
var node = _linker.getLinkingNode3(fragment);
42+
var node = _linker.getLinkingNode2(fragment);
4343
if (node is ConstructorDeclaration) {
4444
for (var initializer in node.initializers) {
4545
if (initializer is RedirectingConstructorInvocation) {

pkg/analyzer/lib/src/summary2/type_alias.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class _Finder {
9292
return;
9393
}
9494

95-
var typeNode = linker.getLinkingNode2(element);
95+
var typeNode = linker.getLinkingNode2(element.firstFragment);
9696
if (typeNode != null) {
9797
if (typeNode == self) {
9898
hasSelfReference = true;

pkg/analyzer/lib/src/summary2/variance_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class VarianceBuilder {
229229
}
230230

231231
void _typeAliasElement(TypeAliasElementImpl2 element) {
232-
var node = _linker.getLinkingNode2(element);
232+
var node = _linker.getLinkingNode2(element.firstFragment);
233233
if (node == null) {
234234
// Not linking.
235235
} else if (node is GenericTypeAliasImpl) {

0 commit comments

Comments
 (0)