Migrate UnlinkedVariable.constExpr to UnlinkedExecutable.bodyExpr.

pkg/analyzer/lib/src/summary/resynthesize.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 summary_resynthesizer;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 2275 matching lines @@
         serializedLabel.isOnSwitchStatement,
         serializedLabel.isOnSwitchMember);
   }
 
   /**
    * Resynthesize a [LocalVariableElement].
    */
   LocalVariableElement buildLocalVariable(UnlinkedVariable serializedVariable,
       ExecutableElementImpl enclosingExecutable) {
     LocalVariableElementImpl element;
-    if (serializedVariable.constExpr != null && serializedVariable.isConst) {
+    if (serializedVariable.initializer?.bodyExpr != null &&
+        serializedVariable.isConst) {
       ConstLocalVariableElementImpl constElement =
           new ConstLocalVariableElementImpl.forSerialized(
               serializedVariable, enclosingExecutable);
       element = constElement;
       constElement.constantInitializer = _buildConstExpression(
-          enclosingExecutable, serializedVariable.constExpr);
+          enclosingExecutable, serializedVariable.initializer.bodyExpr);
     } else {
       element = new LocalVariableElementImpl.forSerialized(
           serializedVariable, enclosingExecutable);
     }
     if (serializedVariable.visibleOffset != 0) {
       element.setVisibleRange(
           serializedVariable.visibleOffset, serializedVariable.visibleLength);
     }
     buildVariableCommonParts(element, serializedVariable);
     return element;
@@ skipping 291 matching lines @@
   }
 
   UnitExplicitTopLevelVariables buildUnitExplicitTopLevelVariables() {
     List<UnlinkedVariable> unlinkedVariables = unlinkedUnit.variables;
     int numberOfVariables = unlinkedVariables.length;
     UnitExplicitTopLevelVariables variablesData =
         new UnitExplicitTopLevelVariables(numberOfVariables);
     for (int i = 0; i < numberOfVariables; i++) {
       UnlinkedVariable unlinkedVariable = unlinkedVariables[i];
       TopLevelVariableElementImpl element;
-      if (unlinkedVariable.constExpr != null && unlinkedVariable.isConst) {
+      if (unlinkedVariable.initializer?.bodyExpr != null &&
+          unlinkedVariable.isConst) {
         ConstTopLevelVariableElementImpl constElement =
             new ConstTopLevelVariableElementImpl.forSerialized(
                 unlinkedVariable, unit);
         element = constElement;
         constElement.constantInitializer =
-            _buildConstExpression(null, unlinkedVariable.constExpr);
+            _buildConstExpression(null, unlinkedVariable.initializer.bodyExpr);
       } else {
         element = new TopLevelVariableElementImpl.forSerialized(
             unlinkedVariable, unit);
       }
       buildPropertyIntroducingElementCommonParts(element, unlinkedVariable);
       variablesData.variables[i] = element;
       // implicit accessors
       String name = element.name;
       DartType type = element.type;
       variablesData.implicitAccessors
           .add(buildImplicitGetter(element, name, type));
       if (!(element.isConst || element.isFinal)) {
         variablesData.implicitAccessors
             .add(buildImplicitSetter(element, name, type));
       }
     }
     return variablesData;
   }
 
   /**
    * Resynthesize a [TopLevelVariableElement] or [FieldElement].
    */
   void buildVariable(
       ClassElementImpl enclosingClass, UnlinkedVariable serializedVariable,
       [ElementHolder holder]) {
     if (holder == null) {
       throw new UnimplementedError('Must be lazy');
     } else {
       FieldElementImpl element;
-      if (serializedVariable.constExpr != null &&
+      if (serializedVariable.initializer?.bodyExpr != null &&
           (serializedVariable.isConst ||
               serializedVariable.isFinal && !serializedVariable.isStatic)) {
         ConstFieldElementImpl constElement =
             new ConstFieldElementImpl.forSerialized(
                 serializedVariable, enclosingClass);
         element = constElement;
-        constElement.constantInitializer =
-            _buildConstExpression(enclosingClass, serializedVariable.constExpr);
+        constElement.constantInitializer = _buildConstExpression(
+            enclosingClass, serializedVariable.initializer.bodyExpr);
       } else {
         element = new FieldElementImpl.forSerialized(
             serializedVariable, enclosingClass);
       }
       buildPropertyIntroducingElementCommonParts(element, serializedVariable);
       element.static = serializedVariable.isStatic;
       holder.addField(element);
       buildImplicitAccessors(element, holder);
       fields[element.name] = element;
     }
@@ skipping 291 matching lines @@
   static String _getElementIdentifier(String name, ReferenceKind kind) {
     if (kind == ReferenceKind.topLevelPropertyAccessor ||
         kind == ReferenceKind.propertyAccessor) {
       if (!name.endsWith('=')) {
         return name + '?';
       }
     }
     return name;
   }
 }