Resynthesize values of final fields of classes with const constructors.

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

 // Copyright (c) 2014, 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 analyzer.src.dart.element.element;
 
 import 'dart:collection';
 import 'dart:math' show min;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 1000 matching lines @@
   ConstructorElement get unnamedConstructor {
     for (ConstructorElement element in constructors) {
       String name = element.displayName;
       if (name == null || name.isEmpty) {
         return element;
       }
     }
     return null;
   }
 
+  bool get _hasConstConstructorKernel =>
+      _kernel != null && _kernel.constructors.any((c) => c.isConst);
+
   @override
   void appendTo(StringBuffer buffer) {
     if (isAbstract) {
       buffer.write('abstract ');
     }
     buffer.write('class ');
     String name = displayName;
     if (name == null) {
       buffer.write("{unnamed class}");
     } else {
@@ skipping 1557 matching lines @@
    * in which case there might be some constant variables that lack
    * initializers.
    */
   Expression _constantInitializer;
 
   EvaluationResultImpl _evaluationResult;
 
   Expression get constantInitializer {
     if (_constantInitializer == null) {
       if (_kernelInitializer != null) {
-        _constantInitializer =
-            enclosingUnit._kernelContext.getExpression(_kernelInitializer);
+        _constantInitializer = enclosingUnit._kernelContext
+            .getExpression(this, _kernelInitializer);
       }
       if (_unlinkedConst != null) {
         _constantInitializer = enclosingUnit.resynthesizerContext
             .buildExpression(this, _unlinkedConst);
       }
     }
     return _constantInitializer;
   }
 
   void set constantInitializer(Expression constantInitializer) {
@@ skipping 1938 matching lines @@
    * Initialize using the given kernel.
    */
   FieldElementImpl.forKernel(ElementImpl enclosingElement, kernel.Field kernel)
       : super.forKernel(enclosingElement, kernel);
 
   /**
    * Initialize using the given kernel.
    */
   factory FieldElementImpl.forKernelFactory(
       ClassElementImpl enclosingClass, kernel.Field kernel) {
-    if (kernel.isConst) {
+    if (kernel.isConst ||
+        kernel.isFinal && enclosingClass._hasConstConstructorKernel) {
       return new ConstFieldElementImpl.forKernel(enclosingClass, kernel);
     } else {
       return new FieldElementImpl.forKernel(enclosingClass, kernel);
     }
   }
 
   /**
    * Initialize a newly created field element to have the given [name].
    */
   FieldElementImpl.forNode(Identifier name) : super.forNode(name);
@@ skipping 1537 matching lines @@
   /**
    * Return the resynthesized [ConstructorInitializer] for the given Kernel
    * [initializer], or `null` if synthetic.
    */
   ConstructorInitializer getConstructorInitializer(
       ConstructorElementImpl constructor, kernel.Initializer initializer);
 
   /**
    * Return the [Expression] for the given kernel.
    */
-  Expression getExpression(kernel.Expression expression);
+  Expression getExpression(ElementImpl context, kernel.Expression expression);
 
   /**
    * Return the list with exactly two elements - positional and named parameter
    * lists.
    */
   List<List<kernel.VariableDeclaration>> getFunctionTypeParameters(
       kernel.FunctionType functionType);
 
   /**
    * Return the [InterfaceType] for the given Kernel [type], or `null` if the
@@ skipping 3793 matching lines @@
 
   @override
   DartObject computeConstantValue() => null;
 
   @override
   void visitChildren(ElementVisitor visitor) {
     super.visitChildren(visitor);
     _initializer?.accept(visitor);
   }
 }