Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c4f2c8e

Browse files
scheglovcommit-bot@chromium.org
scheglov
authored and
commit-bot@chromium.org
committed
Remove commented out code from LinkedUnitContext.
Change-Id: Ie98122bfa5d9dfcf60f6ea3734a4c44c905ffee5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/168128 Reviewed-by: Samuel Rawlins <srawlins@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
1 parent 494eb72 commit c4f2c8e

File tree

2 files changed

+33
-91
lines changed

2 files changed

+33
-91
lines changed

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

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3731,7 +3731,7 @@ abstract class ExecutableElementImpl extends ElementImpl
37313731
var context = enclosingUnit.linkedContext;
37323732
var containerRef = reference.getChild('@parameter');
37333733
var formalParameters = context.getFormalParameters(linkedNode);
3734-
_parameters = ParameterElementImpl.forLinkedNodeList(
3734+
return _parameters = ParameterElementImpl.forLinkedNodeList(
37353735
this,
37363736
context,
37373737
containerRef,
@@ -4537,11 +4537,11 @@ class FunctionTypeAliasElementImpl extends ElementImpl
45374537
GenericFunctionTypeElementImpl get function {
45384538
if (_function != null) return _function;
45394539

4540-
if (linkedNode != null) {
4541-
LazyAst.applyResolution(linkedNode);
4542-
if (linkedNode is GenericTypeAlias) {
4543-
var context = enclosingUnit.linkedContext;
4544-
var function = context.getGeneticTypeAliasFunction(linkedNode);
4540+
var node = linkedNode;
4541+
if (node != null) {
4542+
LazyAst.applyResolution(node);
4543+
if (node is GenericTypeAlias) {
4544+
var function = node.functionType;
45454545
if (function != null) {
45464546
return _function = GenericFunctionTypeElementImpl.forLinkedNode(
45474547
this,
@@ -4742,17 +4742,20 @@ class GenericFunctionTypeElementImpl extends ElementImpl
47424742

47434743
@override
47444744
List<ParameterElement> get parameters {
4745-
if (_parameters == null) {
4746-
if (linkedNode != null) {
4747-
var context = enclosingUnit.linkedContext;
4748-
return _parameters = ParameterElementImpl.forLinkedNodeList(
4749-
this,
4750-
context,
4751-
reference.getChild('@parameter'),
4752-
context.getFormalParameters(linkedNode),
4753-
);
4754-
}
4745+
if (_parameters != null) return _parameters;
4746+
4747+
if (linkedNode != null) {
4748+
var context = enclosingUnit.linkedContext;
4749+
var containerRef = reference.getChild('@parameter');
4750+
var formalParameters = context.getFormalParameters(linkedNode);
4751+
return _parameters = ParameterElementImpl.forLinkedNodeList(
4752+
this,
4753+
context,
4754+
containerRef,
4755+
formalParameters,
4756+
);
47554757
}
4758+
47564759
return _parameters ?? const <ParameterElement>[];
47574760
}
47584761

@@ -6569,18 +6572,14 @@ class ParameterElementImpl extends VariableElementImpl
65696572

65706573
if (linkedNode != null) {
65716574
var context = enclosingUnit.linkedContext;
6575+
var containerRef = reference.getChild('@parameter');
65726576
var formalParameters = context.getFormalParameters(linkedNode);
6573-
if (formalParameters != null) {
6574-
var containerRef = reference.getChild('@parameter');
6575-
return _parameters = ParameterElementImpl.forLinkedNodeList(
6576-
this,
6577-
context,
6578-
containerRef,
6579-
formalParameters,
6580-
);
6581-
} else {
6582-
return _parameters ??= const <ParameterElement>[];
6583-
}
6577+
return _parameters = ParameterElementImpl.forLinkedNodeList(
6578+
this,
6579+
context,
6580+
containerRef,
6581+
formalParameters,
6582+
);
65846583
}
65856584

65866585
return _parameters ??= const <ParameterElement>[];
@@ -6614,7 +6613,7 @@ class ParameterElementImpl extends VariableElementImpl
66146613
if (_typeParameters != null) return _typeParameters;
66156614

66166615
if (linkedNode != null) {
6617-
var typeParameters = linkedContext.getTypeParameters2(linkedNode);
6616+
var typeParameters = linkedContext.getTypeParameters(linkedNode);
66186617
if (typeParameters == null) {
66196618
return _typeParameters = const [];
66206619
}
@@ -7429,8 +7428,8 @@ class TypeParameterElementImpl extends ElementImpl
74297428
if (_bound != null) return _bound;
74307429

74317430
if (linkedNode != null) {
7432-
var context = enclosingUnit.linkedContext;
7433-
return _bound = context.getTypeParameterBound(linkedNode)?.type;
7431+
var node = linkedNode as TypeParameter;
7432+
return _bound = node.bound?.type;
74347433
}
74357434

74367435
return _bound;
@@ -7565,7 +7564,7 @@ mixin TypeParameterizedElementMixin
75657564

75667565
if (linkedNode != null) {
75677566
LazyAst.applyResolution(linkedNode);
7568-
var typeParameters = linkedContext.getTypeParameters2(linkedNode);
7567+
var typeParameters = linkedContext.getTypeParameters(linkedNode);
75697568
if (typeParameters == null) {
75707569
return _typeParameterElements = const [];
75717570
}

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

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -320,50 +320,32 @@ class LinkedUnitContext {
320320

321321
List<FormalParameter> getFormalParameters(AstNode node) {
322322
if (node is ConstructorDeclaration) {
323-
// LazyConstructorDeclaration.readFormalParameters(_astReader, node);
324323
return node.parameters.parameters;
325324
} else if (node is FunctionDeclaration) {
326-
// LazyFunctionDeclaration.readFunctionExpression(_astReader, node);
327325
return getFormalParameters(node.functionExpression);
328326
} else if (node is FunctionExpression) {
329-
// LazyFunctionExpression.readFormalParameters(_astReader, node);
330327
return node.parameters?.parameters;
331328
} else if (node is FormalParameter) {
332329
if (node is DefaultFormalParameter) {
333330
return getFormalParameters(node.parameter);
334331
} else if (node is FieldFormalParameter) {
335-
// LazyFormalParameter.readFormalParameters(_astReader, node);
336332
return node.parameters?.parameters;
337333
} else if (node is FunctionTypedFormalParameter) {
338-
// LazyFormalParameter.readFormalParameters(_astReader, node);
339334
return node.parameters.parameters;
340335
} else {
341336
return null;
342337
}
343338
} else if (node is FunctionTypeAlias) {
344-
// LazyFunctionTypeAlias.readFormalParameters(_astReader, node);
345339
return node.parameters.parameters;
346340
} else if (node is GenericFunctionType) {
347341
return node.parameters.parameters;
348342
} else if (node is MethodDeclaration) {
349-
// LazyMethodDeclaration.readFormalParameters(_astReader, node);
350343
return node.parameters?.parameters;
351344
} else {
352345
throw UnimplementedError('${node.runtimeType}');
353346
}
354347
}
355348

356-
Reference getGenericFunctionTypeReference(GenericFunctionType node) {
357-
var containerRef = reference.getChild('@genericFunctionType');
358-
var id = LazyAst.getGenericFunctionTypeId(node);
359-
return containerRef.getChild('$id');
360-
}
361-
362-
GenericFunctionType getGeneticTypeAliasFunction(GenericTypeAlias node) {
363-
// LazyGenericTypeAlias.readFunctionType(_astReader, node);
364-
return node.functionType;
365-
}
366-
367349
bool getHasTypedefSelfReference(AstNode node) {
368350
if (node is FunctionTypeAlias) {
369351
return LazyFunctionTypeAlias.getHasSelfReference(node);
@@ -375,13 +357,10 @@ class LinkedUnitContext {
375357

376358
ImplementsClause getImplementsClause(AstNode node) {
377359
if (node is ClassDeclaration) {
378-
// LazyClassDeclaration.readImplementsClause(_astReader, node);
379360
return node.implementsClause;
380361
} else if (node is ClassTypeAlias) {
381-
// LazyClassTypeAlias.readImplementsClause(_astReader, node);
382362
return node.implementsClause;
383363
} else if (node is MixinDeclaration) {
384-
// LazyMixinDeclaration.readImplementsClause(_astReader, node);
385364
return node.implementsClause;
386365
} else {
387366
throw UnimplementedError('${node.runtimeType}');
@@ -434,10 +413,8 @@ class LinkedUnitContext {
434413

435414
List<Annotation> getMetadata(AstNode node) {
436415
if (node is ClassDeclaration) {
437-
// LazyClassDeclaration.readMetadata(_astReader, node);
438416
return node.metadata;
439417
} else if (node is ClassTypeAlias) {
440-
// LazyClassTypeAlias.readMetadata(_astReader, node);
441418
return node.metadata;
442419
} else if (node is CompilationUnit) {
443420
assert(node == _unit);
@@ -447,50 +424,36 @@ class LinkedUnitContext {
447424
return const <Annotation>[];
448425
}
449426
} else if (node is ConstructorDeclaration) {
450-
// LazyConstructorDeclaration.readMetadata(_astReader, node);
451427
return node.metadata;
452428
} else if (node is DefaultFormalParameter) {
453429
return getMetadata(node.parameter);
454430
} else if (node is Directive) {
455-
// LazyDirective.readMetadata(_astReader, node);
456431
return node.metadata;
457432
} else if (node is EnumConstantDeclaration) {
458-
// LazyEnumConstantDeclaration.readMetadata(_astReader, node);
459433
return node.metadata;
460434
} else if (node is EnumDeclaration) {
461-
// LazyEnumDeclaration.readMetadata(_astReader, node);
462435
return node.metadata;
463436
} else if (node is ExtensionDeclaration) {
464-
// LazyExtensionDeclaration.readMetadata(_astReader, node);
465437
return node.metadata;
466438
} else if (node is FormalParameter) {
467-
// LazyFormalParameter.readMetadata(_astReader, node);
468439
return node.metadata;
469440
} else if (node is FunctionDeclaration) {
470-
// LazyFunctionDeclaration.readMetadata(_astReader, node);
471441
return node.metadata;
472442
} else if (node is FunctionTypeAlias) {
473-
// LazyFunctionTypeAlias.readMetadata(_astReader, node);
474443
return node.metadata;
475444
} else if (node is GenericTypeAlias) {
476-
// LazyGenericTypeAlias.readMetadata(_astReader, node);
477445
return node.metadata;
478446
} else if (node is MethodDeclaration) {
479-
// LazyMethodDeclaration.readMetadata(_astReader, node);
480447
return node.metadata;
481448
} else if (node is MixinDeclaration) {
482-
// LazyMixinDeclaration.readMetadata(_astReader, node);
483449
return node.metadata;
484450
} else if (node is TypeParameter) {
485-
// LazyTypeParameter.readMetadata(_astReader, node);
486451
return node.metadata;
487452
} else if (node is VariableDeclaration) {
488453
var parent2 = node.parent.parent;
489454
if (parent2 is FieldDeclaration) {
490-
// LazyFieldDeclaration.readMetadata(_astReader, parent2);
491455
return parent2.metadata;
492456
} else if (parent2 is TopLevelVariableDeclaration) {
493-
// LazyTopLevelVariableDeclaration.readMetadata(_astReader, parent2);
494457
return parent2.metadata;
495458
}
496459
}
@@ -539,15 +502,12 @@ class LinkedUnitContext {
539502
DartType getReturnType(AstNode node) {
540503
if (node is FunctionDeclaration) {
541504
return LazyAst.getReturnType(node);
542-
// return LazyFunctionDeclaration.getReturnType(_astReader, node);
543505
} else if (node is FunctionTypeAlias) {
544506
return LazyAst.getReturnType(node);
545-
// return LazyFunctionTypeAlias.getReturnType(_astReader, node);
546507
} else if (node is GenericFunctionType) {
547508
return node.returnType?.type ?? DynamicTypeImpl.instance;
548509
} else if (node is MethodDeclaration) {
549510
return LazyAst.getReturnType(node);
550-
// return LazyMethodDeclaration.getReturnType(_astReader, node);
551511
} else {
552512
throw UnimplementedError('${node.runtimeType}');
553513
}
@@ -573,10 +533,8 @@ class LinkedUnitContext {
573533

574534
TypeName getSuperclass(AstNode node) {
575535
if (node is ClassDeclaration) {
576-
// LazyClassDeclaration.readExtendsClause(_astReader, node);
577536
return node.extendsClause?.superclass;
578537
} else if (node is ClassTypeAlias) {
579-
// LazyClassTypeAlias.readSuperclass(_astReader, node);
580538
return node.superclass;
581539
} else {
582540
throw StateError('${node.runtimeType}');
@@ -589,10 +547,8 @@ class LinkedUnitContext {
589547
return getType(node.parameter);
590548
} else if (node is FormalParameter) {
591549
return LazyAst.getType(node);
592-
// return LazyFormalParameter.getType(_astReader, node);
593550
} else if (node is VariableDeclaration) {
594551
return LazyAst.getType(node);
595-
// return LazyVariableDeclaration.getType(_astReader, node);
596552
} else {
597553
throw UnimplementedError('${node.runtimeType}');
598554
}
@@ -608,27 +564,21 @@ class LinkedUnitContext {
608564
}
609565
}
610566

611-
TypeAnnotation getTypeParameterBound(TypeParameter node) {
612-
// LazyTypeParameter.readBound(_astReader, node);
613-
return node.bound;
614-
}
615-
616-
TypeParameterList getTypeParameters2(AstNode node) {
567+
TypeParameterList getTypeParameters(AstNode node) {
617568
if (node is ClassDeclaration) {
618569
return node.typeParameters;
619570
} else if (node is ClassTypeAlias) {
620571
return node.typeParameters;
621572
} else if (node is ConstructorDeclaration) {
622573
return null;
623574
} else if (node is DefaultFormalParameter) {
624-
return getTypeParameters2(node.parameter);
575+
return getTypeParameters(node.parameter);
625576
} else if (node is ExtensionDeclaration) {
626577
return node.typeParameters;
627578
} else if (node is FieldFormalParameter) {
628579
return node.typeParameters;
629580
} else if (node is FunctionDeclaration) {
630-
// LazyFunctionDeclaration.readFunctionExpression(_astReader, node);
631-
return getTypeParameters2(node.functionExpression);
581+
return getTypeParameters(node.functionExpression);
632582
} else if (node is FunctionExpression) {
633583
return node.typeParameters;
634584
} else if (node is FunctionTypedFormalParameter) {
@@ -656,10 +606,8 @@ class LinkedUnitContext {
656606

657607
WithClause getWithClause(AstNode node) {
658608
if (node is ClassDeclaration) {
659-
// LazyClassDeclaration.readWithClause(_astReader, node);
660609
return node.withClause;
661610
} else if (node is ClassTypeAlias) {
662-
// LazyClassTypeAlias.readWithClause(_astReader, node);
663611
return node.withClause;
664612
} else {
665613
throw UnimplementedError('${node.runtimeType}');
@@ -744,7 +692,6 @@ class LinkedUnitContext {
744692
if (node is ConstructorDeclaration) {
745693
return false;
746694
} else if (node is FunctionDeclaration) {
747-
// LazyFunctionDeclaration.readFunctionExpression(_astReader, node);
748695
return isAsynchronous(node.functionExpression);
749696
} else if (node is FunctionExpression) {
750697
return LazyFunctionExpression.isAsynchronous(node);
@@ -824,7 +771,6 @@ class LinkedUnitContext {
824771
if (node is ConstructorDeclaration) {
825772
return false;
826773
} else if (node is FunctionDeclaration) {
827-
// LazyFunctionDeclaration.readFunctionExpression(_astReader, node);
828774
return isGenerator(node.functionExpression);
829775
} else if (node is FunctionExpression) {
830776
return LazyFunctionExpression.isGenerator(node);
@@ -906,10 +852,8 @@ class LinkedUnitContext {
906852

907853
Expression readInitializer(AstNode node) {
908854
if (node is DefaultFormalParameter) {
909-
// LazyFormalParameter.readDefaultValue(_astReader, node);
910855
return node.defaultValue;
911856
} else if (node is VariableDeclaration) {
912-
// LazyVariableDeclaration.readInitializer(_astReader, node);
913857
return node.initializer;
914858
} else {
915859
throw StateError('${node.runtimeType}');
@@ -1118,7 +1062,6 @@ class LinkedUnitContext {
11181062
partDirectiveIndex++;
11191063
if (partDirectiveIndex == indexInLibrary) {
11201064
LazyAst.applyResolution(directive);
1121-
// LazyDirective.readMetadata(definingContext._astReader, directive);
11221065
return directive.metadata;
11231066
}
11241067
}

0 commit comments

Comments
 (0)