Drop implicit types from summaries.

pkg/analyzer/lib/src/summary/summarize_ast.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library serialization.summarize_ast;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
@@ skipping 147 matching lines @@
   final List<UnlinkedImportBuilder> unlinkedImports = <UnlinkedImportBuilder>[];
 
   /**
    * The unlinked portion of the "references table".  This is the list of
    * objects which should be written to [UnlinkedUnit.references].
    */
   final List<UnlinkedReferenceBuilder> unlinkedReferences =
       <UnlinkedReferenceBuilder>[new UnlinkedReferenceBuilder()];
 
   /**
-   * The [ClassDeclaration] currently being summarized, or `null` if we are not
-   * currently visiting a [ClassDeclaration].
-   */
-  ClassDeclaration currentClassDeclaration;
-
-  /**
    * Map associating names used as prefixes in this compilation unit with their
    * associated indices into [UnlinkedUnit.references].
    */
   final Map<String, int> prefixIndices = <String, int>{};
 
   /**
    * List of [_Scope]s currently in effect.  This is used to resolve type names
    * to type parameters within classes, typedefs, and executables.
    */
   final List<_Scope> scopes = <_Scope>[];
@@ skipping 68 matching lines @@
           // We don't have to worry about the one with a trailing `=` because
           // the only thing we look up is type names.
           scope[field.name.name] = new _OtherScopedEntity();
         }
       }
     }
     return scope;
   }
 
   /**
-   * Try to find a field with the given [name] in the current class declaration
-   * and return its type.  If no field is found, or there isn't a current
-   * class declaration, return null.
-   */
-  TypeName getFieldType(String name) {
-    if (currentClassDeclaration == null) {
-      return null;
-    }
-    for (ClassMember member in currentClassDeclaration.members) {
-      if (member is FieldDeclaration) {
-        for (VariableDeclaration variable in member.fields.variables) {
-          if (variable.name.name == name) {
-            return member.fields.type;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
    * Serialize a [ClassDeclaration] or [ClassTypeAlias] into an [UnlinkedClass]
    * and store the result in [classes].
    */
   void serializeClass(
       Token abstractKeyword,
       String name,
       int nameOffset,
       TypeParameterList typeParameters,
       TypeName superclass,
       WithClause withClause,
@@ skipping 146 matching lines @@
     }
     b.isAbstract = body is EmptyFunctionBody;
     b.name = nameString;
     b.nameOffset = name.offset;
     b.typeParameters =
         serializeTypeParameters(typeParameters, typeParameterScope);
     if (!isTopLevel) {
       b.isStatic = isStatic;
     }
     b.returnType = serializeTypeName(returnType);
-    b.hasImplicitReturnType = returnType == null;
     b.isExternal = isExternal;
     if (formalParameters != null) {
       b.parameters = formalParameters.parameters
           .map((FormalParameter p) => p.accept(this))
           .toList();
     }
     b.documentationComment = serializeDocumentation(documentationComment);
     scopes.removeLast();
     assert(scopes.length == oldScopesLength);
     return b;
@@ skipping 53 matching lines @@
         return index;
       });
 
   /**
    * 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 [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).
    */
   EntityRefBuilder serializeTypeName(TypeName node) {
-    EntityRefBuilder b = new EntityRefBuilder();
     if (node == null) {
-      b.reference = serializeReference(null, 'dynamic');
+      return null;
     } else {
+      EntityRefBuilder b = new EntityRefBuilder();
       Identifier identifier = node.name;
       if (identifier is SimpleIdentifier) {
         String name = identifier.name;
         int indexOffset = 0;
         for (int i = scopes.length - 1; i >= 0; i--) {
           _Scope scope = scopes[i];
           _ScopedEntity entity = scope[name];
           if (entity != null) {
             if (entity is _ScopedTypeParameter) {
               b.paramReference = indexOffset + entity.index;
@@ skipping 29 matching lines @@
           --numArgsToSerialize;
         }
         if (numArgsToSerialize > 0) {
           List<EntityRefBuilder> serializedArguments = <EntityRefBuilder>[];
           for (int i = 0; i < numArgsToSerialize; i++) {
             serializedArguments.add(serializeTypeName(args[i]));
           }
           b.typeArguments = serializedArguments;
         }
       }
+      return b;
     }
-    return b;
   }
 
   /**
    * Serialize the given [typeParameters] into a list of [UnlinkedTypeParam]s,
    * and also store them in [typeParameterScope].
    */
   List<UnlinkedTypeParamBuilder> serializeTypeParameters(
       TypeParameterList typeParameters,
       _TypeParameterScope typeParameterScope) {
     if (typeParameters != null) {
@@ skipping 14 matching lines @@
   void serializeVariables(VariableDeclarationList variables, bool isStatic,
       Comment documentationComment) {
     for (VariableDeclaration variable in variables.variables) {
       UnlinkedVariableBuilder b = new UnlinkedVariableBuilder();
       b.isFinal = variables.isFinal;
       b.isConst = variables.isConst;
       b.isStatic = isStatic;
       b.name = variable.name.name;
       b.nameOffset = variable.name.offset;
       b.type = serializeTypeName(variables.type);
-      b.hasImplicitType = variables.type == null;
       b.documentationComment = serializeDocumentation(documentationComment);
       if (variable.isConst) {
         Expression initializer = variable.initializer;
         if (initializer != null) {
           b.constExpr = serializeConstExpr(initializer);
         }
       }
       if (variable.initializer != null &&
           (variables.isFinal || variables.isConst)) {
         b.propagatedTypeSlot = assignTypeSlot();
       }
       this.variables.add(b);
     }
   }
 
   @override
   void visitClassDeclaration(ClassDeclaration node) {
-    currentClassDeclaration = node;
     TypeName superclass =
         node.extendsClause == null ? null : node.extendsClause.superclass;
     serializeClass(
         node.abstractKeyword,
         node.name.name,
         node.name.offset,
         node.typeParameters,
         superclass,
         node.withClause,
         node.implementsClause,
         node.members,
         false,
         node.documentationComment);
-    currentClassDeclaration = null;
   }
 
   @override
   void visitClassTypeAlias(ClassTypeAlias node) {
     serializeClass(
         node.abstractKeyword,
         node.name.name,
         node.name.offset,
         node.typeParameters,
         node.superclass,
@@ skipping 53 matching lines @@
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
     serializeVariables(
         node.fields, node.staticKeyword != null, node.documentationComment);
   }
 
   @override
   UnlinkedParamBuilder visitFieldFormalParameter(FieldFormalParameter node) {
     UnlinkedParamBuilder b = serializeParameter(node);
     b.isInitializingFormal = true;
-    if (node.type == null && node.parameters == null) {
-      b.hasImplicitType = true;
-    } else {
+    if (node.type != null || node.parameters != null) {
       b.isFunctionTyped = node.parameters != null;
       if (node.parameters != null) {
         serializeFunctionTypedParameterDetails(b, node.type, node.parameters);
       } else {
-        TypeName typeName = node.type;
-        if (typeName == null) {
-          typeName = getFieldType(node.identifier.name);
-        }
-        b.type = serializeTypeName(typeName);
+        b.type = serializeTypeName(node.type);
       }
     }
     return b;
   }
 
   @override
   void visitFunctionDeclaration(FunctionDeclaration node) {
     executables.add(serializeExecutable(
         node.name,
         node.isGetter,
@@ skipping 91 matching lines @@
         uriOffset: node.uri.offset, uriEnd: node.uri.end));
   }
 
   @override
   void visitPartOfDirective(PartOfDirective node) {}
 
   @override
   UnlinkedParamBuilder visitSimpleFormalParameter(SimpleFormalParameter node) {
     UnlinkedParamBuilder b = serializeParameter(node);
     b.type = serializeTypeName(node.type);
-    b.hasImplicitType = node.type == null;
     return b;
   }
 
   @override
   void visitTopLevelVariableDeclaration(TopLevelVariableDeclaration node) {
     serializeVariables(node.variables, false, node.documentationComment);
   }
 
   @override
   UnlinkedTypeParamBuilder visitTypeParameter(TypeParameter node) {
@@ skipping 18 matching lines @@
 /**
  * A [_TypeParameterScope] is a [_Scope] which defines [_ScopedTypeParameter]s.
  */
 class _TypeParameterScope extends _Scope {
   /**
    * Get the number of [_ScopedTypeParameter]s defined in this
    * [_TypeParameterScope].
    */
   int get length => _definedNames.length;
 }