Skip to content

Commit de71dd4

Browse files
scheglovscheglov
committed
Rename Reference.node2 to just 'node'.
[email protected] Change-Id: Iddb1f3154ac7b711a3b7302f85e321cd896f61e0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110544 Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 95dcd5c commit de71dd4

File tree

5 files changed

+40
-44
lines changed

5 files changed

+40
-44
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9180,7 +9180,7 @@ class ParameterElementImpl extends VariableElementImpl
91809180
NormalFormalParameter parameterNode = node.parameter;
91819181
var name = parameterNode.identifier?.name ?? '';
91829182
var reference = containerRef.getChild(name);
9183-
reference.node2 = node;
9183+
reference.node = node;
91849184
if (parameterNode is FieldFormalParameter) {
91859185
return DefaultFieldFormalParameterElementImpl.forLinkedNode(
91869186
enclosing,

‎pkg/analyzer/lib/src/summary2/builder/source_library_builder.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,25 @@ class SourceLibraryBuilder {
105105
if (node is ast.ClassDeclaration) {
106106
var name = node.name.name;
107107
var reference = classRef.getChild(name);
108-
reference.node2 = node;
108+
reference.node = node;
109109
localScope.declare(name, reference);
110110
} else if (node is ast.ClassTypeAlias) {
111111
var name = node.name.name;
112112
var reference = classRef.getChild(name);
113-
reference.node2 = node;
113+
reference.node = node;
114114
localScope.declare(name, reference);
115115
} else if (node is ast.EnumDeclaration) {
116116
var name = node.name.name;
117117
var reference = enumRef.getChild(name);
118-
reference.node2 = node;
118+
reference.node = node;
119119
localScope.declare(name, reference);
120120
} else if (node is ast.ExtensionDeclaration) {
121121
var name = node.name?.name;
122122
var refName = name ?? 'extension-${nextUnnamedExtensionId++}';
123123
LazyExtensionDeclaration.get(node).setRefName(refName);
124124

125125
var reference = extensionRef.getChild(refName);
126-
reference.node2 = node;
126+
reference.node = node;
127127

128128
if (name != null) {
129129
localScope.declare(name, reference);
@@ -141,7 +141,7 @@ class SourceLibraryBuilder {
141141
}
142142

143143
var reference = containerRef.getChild(name);
144-
reference.node2 = node;
144+
reference.node = node;
145145

146146
if (node.isSetter) {
147147
localScope.declare('$name=', reference);
@@ -151,26 +151,26 @@ class SourceLibraryBuilder {
151151
} else if (node is ast.FunctionTypeAlias) {
152152
var name = node.name.name;
153153
var reference = typeAliasRef.getChild(name);
154-
reference.node2 = node;
154+
reference.node = node;
155155

156156
localScope.declare(name, reference);
157157
} else if (node is ast.GenericTypeAlias) {
158158
var name = node.name.name;
159159
var reference = typeAliasRef.getChild(name);
160-
reference.node2 = node;
160+
reference.node = node;
161161

162162
localScope.declare(name, reference);
163163
} else if (node is ast.MixinDeclaration) {
164164
var name = node.name.name;
165165
var reference = mixinRef.getChild(name);
166-
reference.node2 = node;
166+
reference.node = node;
167167
localScope.declare(name, reference);
168168
} else if (node is ast.TopLevelVariableDeclaration) {
169169
for (var variable in node.variables.variables) {
170170
var name = variable.name.name;
171171

172172
var reference = variableRef.getChild(name);
173-
reference.node2 = node;
173+
reference.node = node;
174174

175175
var getter = getterRef.getChild(name);
176176
localScope.declare(name, getter);

‎pkg/analyzer/lib/src/summary2/linked_element_factory.dart‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ class _ElementRequest {
254254

255255
ClassElementImpl _class(
256256
CompilationUnitElementImpl unit, Reference reference) {
257-
if (reference.node2 == null) {
257+
if (reference.node == null) {
258258
_indexUnitElementDeclarations(unit);
259-
assert(reference.node2 != null, '$reference');
259+
assert(reference.node != null, '$reference');
260260
}
261-
ClassElementImpl.forLinkedNode(unit, reference, reference.node2);
261+
ClassElementImpl.forLinkedNode(unit, reference, reference.node);
262262
return reference.element;
263263
}
264264

@@ -332,21 +332,21 @@ class _ElementRequest {
332332
}
333333

334334
EnumElementImpl _enum(CompilationUnitElementImpl unit, Reference reference) {
335-
if (reference.node2 == null) {
335+
if (reference.node == null) {
336336
_indexUnitElementDeclarations(unit);
337-
assert(reference.node2 != null, '$reference');
337+
assert(reference.node != null, '$reference');
338338
}
339-
EnumElementImpl.forLinkedNode(unit, reference, reference.node2);
339+
EnumElementImpl.forLinkedNode(unit, reference, reference.node);
340340
return reference.element;
341341
}
342342

343343
ExtensionElementImpl _extension(
344344
CompilationUnitElementImpl unit, Reference reference) {
345-
if (reference.node2 == null) {
345+
if (reference.node == null) {
346346
_indexUnitElementDeclarations(unit);
347-
assert(reference.node2 != null, '$reference');
347+
assert(reference.node != null, '$reference');
348348
}
349-
ExtensionElementImpl.forLinkedNode(unit, reference, reference.node2);
349+
ExtensionElementImpl.forLinkedNode(unit, reference, reference.node);
350350
return reference.element;
351351
}
352352

@@ -379,11 +379,11 @@ class _ElementRequest {
379379

380380
MixinElementImpl _mixin(
381381
CompilationUnitElementImpl unit, Reference reference) {
382-
if (reference.node2 == null) {
382+
if (reference.node == null) {
383383
_indexUnitElementDeclarations(unit);
384-
assert(reference.node2 != null, '$reference');
384+
assert(reference.node != null, '$reference');
385385
}
386-
MixinElementImpl.forLinkedNode(unit, reference, reference.node2);
386+
MixinElementImpl.forLinkedNode(unit, reference, reference.node);
387387
return reference.element;
388388
}
389389

@@ -403,11 +403,11 @@ class _ElementRequest {
403403

404404
GenericTypeAliasElementImpl _typeAlias(
405405
CompilationUnitElementImpl unit, Reference reference) {
406-
if (reference.node2 == null) {
406+
if (reference.node == null) {
407407
_indexUnitElementDeclarations(unit);
408-
assert(reference.node2 != null, '$reference');
408+
assert(reference.node != null, '$reference');
409409
}
410-
GenericTypeAliasElementImpl.forLinkedNode(unit, reference, reference.node2);
410+
GenericTypeAliasElementImpl.forLinkedNode(unit, reference, reference.node);
411411
return reference.element;
412412
}
413413

@@ -429,32 +429,32 @@ class _ElementRequest {
429429
for (var declaration in unitNode.declarations) {
430430
if (declaration is ClassDeclaration) {
431431
var name = declaration.name.name;
432-
classRef.getChild(name).node2 = declaration;
432+
classRef.getChild(name).node = declaration;
433433
} else if (declaration is ClassTypeAlias) {
434434
var name = declaration.name.name;
435-
classRef.getChild(name).node2 = declaration;
435+
classRef.getChild(name).node = declaration;
436436
} else if (declaration is ExtensionDeclaration) {
437437
var refName = LazyExtensionDeclaration.get(declaration).refName;
438-
extensionRef.getChild(refName).node2 = declaration;
438+
extensionRef.getChild(refName).node = declaration;
439439
} else if (declaration is EnumDeclaration) {
440440
var name = declaration.name.name;
441-
enumRef.getChild(name).node2 = declaration;
441+
enumRef.getChild(name).node = declaration;
442442
} else if (declaration is FunctionDeclaration) {
443443
var name = declaration.name.name;
444-
functionRef.getChild(name).node2 = declaration;
444+
functionRef.getChild(name).node = declaration;
445445
} else if (declaration is FunctionTypeAlias) {
446446
var name = declaration.name.name;
447-
typeAliasRef.getChild(name).node2 = declaration;
447+
typeAliasRef.getChild(name).node = declaration;
448448
} else if (declaration is GenericTypeAlias) {
449449
var name = declaration.name.name;
450-
typeAliasRef.getChild(name).node2 = declaration;
450+
typeAliasRef.getChild(name).node = declaration;
451451
} else if (declaration is MixinDeclaration) {
452452
var name = declaration.name.name;
453-
mixinRef.getChild(name).node2 = declaration;
453+
mixinRef.getChild(name).node = declaration;
454454
} else if (declaration is TopLevelVariableDeclaration) {
455455
for (var variable in declaration.variables.variables) {
456456
var name = variable.name.name;
457-
variableRef.getChild(name).node2 = declaration;
457+
variableRef.getChild(name).node = declaration;
458458
}
459459
}
460460
}

‎pkg/analyzer/lib/src/summary2/reference.dart‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/element/element.dart';
7-
import 'package:analyzer/src/summary/idl.dart';
87
import 'package:analyzer/src/summary2/scope.dart';
98

109
/// Indirection between a name and the corresponding [Element].
@@ -33,11 +32,8 @@ class Reference {
3332
/// The simple name of the reference in its [parent].
3433
final String name;
3534

36-
/// The corresponding [LinkedNode], or `null` if a named container.
37-
LinkedNode node;
38-
3935
/// The corresponding [AstNode], or `null` if a named container.
40-
AstNode node2;
36+
AstNode node;
4137

4238
/// The corresponding [Element], or `null` if a named container.
4339
Element element;
@@ -89,11 +85,11 @@ class Reference {
8985
/// The element might be not `null`, but the node is different in case of
9086
/// duplicate declarations.
9187
bool hasElementFor(AstNode node) {
92-
if (element != null && node2 == node) {
88+
if (element != null && this.node == node) {
9389
return true;
9490
} else {
95-
if (node2 == null) {
96-
node2 = node;
91+
if (node == null) {
92+
this.node = node;
9793
}
9894
return false;
9995
}

‎pkg/analyzer/lib/src/summary2/reference_resolver.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
279279

280280
var name = node.identifier.name;
281281
reference = reference.getChild('@parameter').getChild(name);
282-
reference.node2 = node;
282+
reference.node = node;
283283

284284
var element = ParameterElementImpl.forLinkedNode(
285285
outerReference.element,
@@ -511,7 +511,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
511511
var outerReference = this.reference;
512512
var containerRef = outerReference.getChild('@typeParameter');
513513
var reference = containerRef.getChild(node.name.name);
514-
reference.node2 = node;
514+
reference.node = node;
515515

516516
var element = TypeParameterElementImpl.forLinkedNode(
517517
outerReference.element,

0 commit comments

Comments
 (0)