Serialize and resynthesize variable initializers.

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

 // Copyright (c) 2015, 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.elements;
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/member.dart';
@@ skipping 20 matching lines @@
 }
 
 ReferenceKind _getReferenceKind(Element element) {
   if (element == null ||
       element is ClassElement ||
       element is DynamicElementImpl) {
     return ReferenceKind.classOrEnum;
   } else if (element is ConstructorElement) {
     return ReferenceKind.constructor;
   } else if (element is FunctionElement) {
-    return ReferenceKind.topLevelFunction;
+    if (element.enclosingElement is CompilationUnitElement) {
+      return ReferenceKind.topLevelFunction;
+    }
+    return ReferenceKind.function;
   } else if (element is FunctionTypeAliasElement) {
     return ReferenceKind.typedef;
   } else if (element is PropertyAccessorElement) {
     if (element.enclosingElement is ClassElement) {
       return ReferenceKind.propertyAccessor;
     }
     return ReferenceKind.topLevelPropertyAccessor;
   } else if (element is MethodElement) {
     return ReferenceKind.method;
   } else {
@@ skipping 460 matching lines @@
   }
 
   /**
    * Serialize the given [executableElement], creating an [UnlinkedExecutable].
    */
   UnlinkedExecutableBuilder serializeExecutable(
       ExecutableElement executableElement) {
     UnlinkedExecutableBuilder b = new UnlinkedExecutableBuilder();
     b.name = executableElement.name;
     b.nameOffset = executableElement.nameOffset;
-    if (executableElement is! ConstructorElement) {
+    if (executableElement.enclosingElement is VariableElement) {
+      // TODO(scheglov) remove this check and serialize initializer types
+      // Note that for code like `var v = null` w need to support Bottom.
+    } else if (executableElement is! ConstructorElement) {
       if (!executableElement.hasImplicitReturnType) {
         b.returnType = serializeTypeRef(
             executableElement.type.returnType, executableElement);
       } else if (!executableElement.isStatic) {
         b.inferredReturnTypeSlot =
             storeInferredType(executableElement.returnType, executableElement);
       }
     }
     b.typeParameters =
         executableElement.typeParameters.map(serializeTypeParam).toList();
@@ skipping 160 matching lines @@
         b.type = serializeTypeRef(type, context);
       }
     }
     if (parameter is ConstVariableElement) {
       ConstVariableElement constParameter = parameter as ConstVariableElement;
       Expression initializer = constParameter.constantInitializer;
       if (initializer != null) {
         b.defaultValue = serializeConstExpr(initializer);
       }
     }
+    if (parameter is! Member && parameter.initializer != null) {

[Paul Berry, 2016/02/17 21:15:30]

Can you include a comment explaining why we want to skip this when parameter is!
Member?  It's not obvious to me.

[scheglov, 2016/02/17 21:27:51]

Done.

+      b.initializer = serializeExecutable(parameter.initializer);
+    }
     {
       SourceRange visibleRange = parameter.visibleRange;
       if (visibleRange != null) {
         b.visibleOffset = visibleRange.offset;
         b.visibleLength = visibleRange.length;
       }
     }
     return b;
   }
 
@@ skipping 193 matching lines @@
         (variable.initializer != null || !variable.isStatic)) {
       b.inferredTypeSlot = storeInferredType(variable.type, variable);
     }
     if (variable is LocalVariableElement) {
       SourceRange visibleRange = variable.visibleRange;
       if (visibleRange != null) {
         b.visibleOffset = visibleRange.offset;
         b.visibleLength = visibleRange.length;
       }
     }
+    if (variable.initializer != null) {
+      // TODO(scheglov) local functions and variables
+      b.initializer = serializeExecutable(variable.initializer);
+//      b.initializer = new UnlinkedExecutableBuilder(

[Paul Berry, 2016/02/17 21:15:30]

Was this commented out code left here unintentionally?

[scheglov, 2016/02/17 21:27:51]

This code should be removed.
Thanks.

+//          nameOffset: variable.initializer.nameOffset);
+    }
     return b;
   }
 
   /**
    * Create a slot id for the given [type] (which is an inferred type).  If
    * strong mode is enabled and [type] is not `dynamic`, it is stored in
    * [linkedTypes] so that once the compilation unit has been fully visited, it
    * will be serialized into [LinkedUnit.types].
    *
    * [context] is the element within which the slot id will appear; this is
@@ skipping 63 matching lines @@
         if (enclosing == null || enclosing is CompilationUnitElement) {
           // Figure out a prefix that may be used to refer to the given element.
           // TODO(paulberry): to avoid subtle relinking inconsistencies we
           // should use the actual prefix from the AST (a given type may be
           // reachable via multiple prefixes), but sadly, this information is
           // not recorded in the element model.
           PrefixElement prefix = librarySerializer.prefixMap[element];
           if (prefix != null) {
             prefixReference = serializePrefix(prefix);
           }
+        } else if (element.isSynthetic &&

[Paul Berry, 2016/02/17 21:15:30]

It seems like this code shouldn't be reachable.

[scheglov, 2016/02/17 21:27:51]

You're right.
I don't remember why I added it, but yes - it is not used.
Removing it now.

+            element is FunctionElement &&
+            element.enclosingElement is VariableElement) {
+          prefixReference = 0;
         } else {
           prefixReference = _getElementReferenceId(enclosing, linked: linked);
         }
         index = serializeUnlinkedReference(name, kind,
             prefixReference: prefixReference, unit: unit);
         linkedReference = linkedReferences[index];
       }
       linkedReference.dependency =
           librarySerializer.serializeDependency(dependentLibrary);
       if (element is TypeParameterizedElement) {
@@ skipping 340 matching lines @@
       exportNames.add(new LinkedExportNameBuilder(
           name: name,
           dependency: serializeDependency(dependentLibrary),
           unit: unit,
           kind: kind));
     }
     pb.exportNames = exportNames;
     return pb;
   }
 }