| Index: pkg/analyzer/lib/src/summary/summarize_ast.dart
|
| diff --git a/pkg/analyzer/lib/src/summary/summarize_ast.dart b/pkg/analyzer/lib/src/summary/summarize_ast.dart
|
| index 71a8395ba642c33e21f7bdf258a3513e1333e809..4880e8e1a8fe5ae7c27ed6d0fb017259d0d77c07 100644
|
| --- a/pkg/analyzer/lib/src/summary/summarize_ast.dart
|
| +++ b/pkg/analyzer/lib/src/summary/summarize_ast.dart
|
| @@ -28,8 +28,8 @@ class _ConstExprSerializer extends AbstractConstExprSerializer {
|
|
|
| _ConstExprSerializer(this.visitor);
|
|
|
| - TypeRefBuilder serializeIdentifier(Identifier identifier) {
|
| - TypeRefBuilder b = new TypeRefBuilder();
|
| + EntityRefBuilder serializeIdentifier(Identifier identifier) {
|
| + EntityRefBuilder b = new EntityRefBuilder();
|
| if (identifier is SimpleIdentifier) {
|
| b.reference = visitor.serializeReference(null, identifier.name);
|
| } else if (identifier is PrefixedIdentifier) {
|
| @@ -44,7 +44,7 @@ class _ConstExprSerializer extends AbstractConstExprSerializer {
|
| }
|
|
|
| @override
|
| - TypeRefBuilder serializeType(TypeName node) {
|
| + EntityRefBuilder serializeType(TypeName node) {
|
| return visitor.serializeTypeName(node);
|
| }
|
| }
|
| @@ -465,7 +465,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
|
| */
|
| void serializeFunctionTypedParameterDetails(UnlinkedParamBuilder b,
|
| TypeName returnType, FormalParameterList parameters) {
|
| - TypeRefBuilder serializedReturnType =
|
| + EntityRefBuilder serializedReturnType =
|
| serializeTypeName(returnType, allowVoid: true);
|
| if (serializedReturnType != null) {
|
| b.type = serializedReturnType;
|
| @@ -518,11 +518,11 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
|
| /**
|
| * Serialize a type name (which might be defined in a nested scope, at top
|
| * level within this library, or at top level within an imported library) to
|
| - * a [TypeRef]. Note that this method does the right thing if the
|
| + * a [EntityRef]. Note that this method does the right thing if the
|
| * name doesn't refer to an entity other than a type (e.g. a class member).
|
| */
|
| - TypeRefBuilder serializeTypeName(TypeName node, {bool allowVoid: false}) {
|
| - TypeRefBuilder b = new TypeRefBuilder();
|
| + EntityRefBuilder serializeTypeName(TypeName node, {bool allowVoid: false}) {
|
| + EntityRefBuilder b = new EntityRefBuilder();
|
| if (node != null) {
|
| Identifier identifier = node.name;
|
| if (identifier is SimpleIdentifier) {
|
| @@ -570,7 +570,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
|
| --numArgsToSerialize;
|
| }
|
| if (numArgsToSerialize > 0) {
|
| - List<TypeRefBuilder> serializedArguments = <TypeRefBuilder>[];
|
| + List<EntityRefBuilder> serializedArguments = <EntityRefBuilder>[];
|
| for (int i = 0; i < numArgsToSerialize; i++) {
|
| serializedArguments.add(serializeTypeName(args[i]));
|
| }
|
| @@ -762,7 +762,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
|
| b.nameOffset = node.name.offset;
|
| b.typeParameters =
|
| serializeTypeParameters(node.typeParameters, typeParameterScope);
|
| - TypeRefBuilder serializedReturnType =
|
| + EntityRefBuilder serializedReturnType =
|
| serializeTypeName(node.returnType, allowVoid: true);
|
| if (serializedReturnType != null) {
|
| b.returnType = serializedReturnType;
|
|
|