Remove ExecutableElement.localVariables altogether.

pkg/analyzer/lib/src/dart/element/builder.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.builder;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 136 matching lines @@
     element.metadata = _createElementAnnotations(node.metadata);
     setElementDocumentationComment(element, node);
     if (node.externalKeyword != null) {
       element.external = true;
     }
     if (node.factoryKeyword != null) {
       element.factory = true;
     }
     element.functions = holder.functions;
     element.labels = holder.labels;
-    element.localVariables = holder.localVariables;
+    element.encloseElements(holder.localVariables);
     element.parameters = holder.parameters;
     element.isConst = node.constKeyword != null;
     element.isCycleFree = element.isConst;
     if (body.isAsynchronous) {
       element.asynchronous = true;
     }
     if (body.isGenerator) {
       element.generator = true;
     }
     _currentHolder.addConstructor(element);
@@ skipping 73 matching lines @@
         FunctionElementImpl element =
             new FunctionElementImpl.forNode(functionName);
         _setCodeRange(element, node);
         element.metadata = _createElementAnnotations(node.metadata);
         setElementDocumentationComment(element, node);
         if (node.externalKeyword != null || body is NativeFunctionBody) {
           element.external = true;
         }
         element.functions = holder.functions;
         element.labels = holder.labels;
-        element.localVariables = holder.localVariables;
+        element.encloseElements(holder.localVariables);
         element.parameters = holder.parameters;
         element.typeParameters = holder.typeParameters;
         if (body.isAsynchronous) {
           element.asynchronous = true;
         }
         if (body.isGenerator) {
           element.generator = true;
         }
         if (node.returnType == null) {
           element.hasImplicitReturnType = true;
@@ skipping 20 matching lines @@
           PropertyAccessorElementImpl getter =
               new PropertyAccessorElementImpl.forNode(propertyNameNode);
           _setCodeRange(getter, node);
           getter.metadata = _createElementAnnotations(node.metadata);
           setElementDocumentationComment(getter, node);
           if (node.externalKeyword != null || body is NativeFunctionBody) {
             getter.external = true;
           }
           getter.functions = holder.functions;
           getter.labels = holder.labels;
-          getter.localVariables = holder.localVariables;
+          getter.encloseElements(holder.localVariables);
           if (body.isAsynchronous) {
             getter.asynchronous = true;
           }
           if (body.isGenerator) {
             getter.generator = true;
           }
           getter.variable = variable;
           getter.getter = true;
           getter.isStatic = true;
           variable.getter = getter;
           if (node.returnType == null) {
             getter.hasImplicitReturnType = true;
           }
           _currentHolder.addAccessor(getter);
           expression.element = getter;
           propertyNameNode.staticElement = getter;
         } else {
           PropertyAccessorElementImpl setter =
               new PropertyAccessorElementImpl.forNode(propertyNameNode);
           _setCodeRange(setter, node);
           setter.metadata = _createElementAnnotations(node.metadata);
           setElementDocumentationComment(setter, node);
           if (node.externalKeyword != null || body is NativeFunctionBody) {
             setter.external = true;
           }
           setter.functions = holder.functions;
           setter.labels = holder.labels;
-          setter.localVariables = holder.localVariables;
+          setter.encloseElements(holder.localVariables);
           setter.parameters = holder.parameters;
           if (body.isAsynchronous) {
             setter.asynchronous = true;
           }
           if (body.isGenerator) {
             setter.generator = true;
           }
           setter.variable = variable;
           setter.setter = true;
           setter.isStatic = true;
@@ skipping 20 matching lines @@
       return super.visitFunctionExpression(node);
     }
     ElementHolder holder = new ElementHolder();
     _visitChildren(holder, node);
     FunctionBody body = node.body;
     FunctionElementImpl element =
         new FunctionElementImpl.forOffset(node.beginToken.offset);
     _setCodeRange(element, node);
     element.functions = holder.functions;
     element.labels = holder.labels;
-    element.localVariables = holder.localVariables;
+    element.encloseElements(holder.localVariables);
     element.parameters = holder.parameters;
     element.typeParameters = holder.typeParameters;
     if (body.isAsynchronous) {
       element.asynchronous = true;
     }
     if (body.isGenerator) {
       element.generator = true;
     }
     element.type = new FunctionTypeImpl(element);
     element.hasImplicitReturnType = true;
@@ skipping 81 matching lines @@
             new MethodElementImpl(nameOfMethod, methodName.offset);
         _setCodeRange(element, node);
         element.metadata = _createElementAnnotations(node.metadata);
         setElementDocumentationComment(element, node);
         element.abstract = node.isAbstract;
         if (node.externalKeyword != null || body is NativeFunctionBody) {
           element.external = true;
         }
         element.functions = holder.functions;
         element.labels = holder.labels;
-        element.localVariables = holder.localVariables;
+        element.encloseElements(holder.localVariables);
         element.parameters = holder.parameters;
         element.isStatic = isStatic;
         element.typeParameters = holder.typeParameters;
         if (body.isAsynchronous) {
           element.asynchronous = true;
         }
         if (body.isGenerator) {
           element.generator = true;
         }
         if (node.returnType == null) {
@@ skipping 17 matching lines @@
           PropertyAccessorElementImpl getter =
               new PropertyAccessorElementImpl.forNode(propertyNameNode);
           _setCodeRange(getter, node);
           getter.metadata = _createElementAnnotations(node.metadata);
           setElementDocumentationComment(getter, node);
           if (node.externalKeyword != null || body is NativeFunctionBody) {
             getter.external = true;
           }
           getter.functions = holder.functions;
           getter.labels = holder.labels;
-          getter.localVariables = holder.localVariables;
+          getter.encloseElements(holder.localVariables);
           if (body.isAsynchronous) {
             getter.asynchronous = true;
           }
           if (body.isGenerator) {
             getter.generator = true;
           }
           getter.variable = field;
           getter.abstract = node.isAbstract;
           getter.getter = true;
           getter.isStatic = isStatic;
           field.getter = getter;
           if (node.returnType == null) {
             getter.hasImplicitReturnType = true;
           }
           _currentHolder.addAccessor(getter);
           propertyNameNode.staticElement = getter;
         } else {
           PropertyAccessorElementImpl setter =
               new PropertyAccessorElementImpl.forNode(propertyNameNode);
           _setCodeRange(setter, node);
           setter.metadata = _createElementAnnotations(node.metadata);
           setElementDocumentationComment(setter, node);
           if (node.externalKeyword != null || body is NativeFunctionBody) {
             setter.external = true;
           }
           setter.functions = holder.functions;
           setter.labels = holder.labels;
-          setter.localVariables = holder.localVariables;
+          setter.encloseElements(holder.localVariables);
           setter.parameters = holder.parameters;
           if (body.isAsynchronous) {
             setter.asynchronous = true;
           }
           if (body.isGenerator) {
             setter.generator = true;
           }
           setter.variable = field;
           setter.abstract = node.isAbstract;
           setter.setter = true;
@@ skipping 627 matching lines @@
     FunctionElementImpl element = new FunctionElementImpl.forNode(node.name);
     _setCodeRange(element, node);
     setElementDocumentationComment(element, node);
     element.metadata = _createElementAnnotations(node.metadata);
     FunctionBody body = expression.body;
     if (node.externalKeyword != null || body is NativeFunctionBody) {
       element.external = true;
     }
     element.functions = holder.functions;
     element.labels = holder.labels;
-    element.localVariables = holder.localVariables;
+    element.encloseElements(holder.localVariables);
     element.parameters = holder.parameters;
     element.typeParameters = holder.typeParameters;
 
     if (body.isAsynchronous) {
       element.asynchronous = body.isAsynchronous;
     }
     if (body.isGenerator) {
       element.generator = true;
     }
 
@@ skipping 23 matching lines @@
       return super.visitFunctionExpression(node);
     }
 
     ElementHolder holder = new ElementHolder();
     _visitChildren(holder, node);
     FunctionElementImpl element =
         new FunctionElementImpl.forOffset(node.beginToken.offset);
     _setCodeRange(element, node);
     element.functions = holder.functions;
     element.labels = holder.labels;
-    element.localVariables = holder.localVariables;
+    element.encloseElements(holder.localVariables);
     element.parameters = holder.parameters;
     element.typeParameters = holder.typeParameters;
 
     FunctionBody body = node.body;
     if (body.isAsynchronous) {
       element.asynchronous = true;
     }
     if (body.isGenerator) {
       element.generator = true;
     }
@@ skipping 102 matching lines @@
   void buildParameterInitializer(
       ParameterElementImpl parameter, Expression defaultValue) {
     if (defaultValue != null) {
       ElementHolder holder = new ElementHolder();
       _visit(holder, defaultValue);
       FunctionElementImpl initializer =
           new FunctionElementImpl.forOffset(defaultValue.beginToken.offset);
       initializer.hasImplicitReturnType = true;
       initializer.functions = holder.functions;
       initializer.labels = holder.labels;
-      initializer.localVariables = holder.localVariables;
+      initializer.encloseElements(holder.localVariables);
       initializer.parameters = holder.parameters;
       initializer.isSynthetic = true;
       initializer.type = new FunctionTypeImpl(initializer);
       parameter.initializer = initializer;
       parameter.defaultValueCode = defaultValue.toSource();
       holder.validate();
     }
   }
 
   /**
    * If the [initializer] is not `null`, build the [FunctionElementImpl] that
    * corresponds it, and set it as the initializer for the [variable].
    */
   void buildVariableInitializer(
       VariableElementImpl variable, Expression initializer) {
     if (initializer != null) {
       ElementHolder holder = new ElementHolder();
       _visit(holder, initializer);
       FunctionElementImpl initializerElement =
           new FunctionElementImpl.forOffset(initializer.beginToken.offset);
       initializerElement.hasImplicitReturnType = true;
       initializerElement.functions = holder.functions;
       initializerElement.labels = holder.labels;
-      initializerElement.localVariables = holder.localVariables;
+      initializerElement.encloseElements(holder.localVariables);
       initializerElement.isSynthetic = true;
       initializerElement.type = new FunctionTypeImpl(initializerElement);
       variable.initializer = initializerElement;
       holder.validate();
     }
   }
 
   @override
   Object visitDefaultFormalParameter(DefaultFormalParameter node) {
     NormalFormalParameter normalParameter = node.parameter;
@@ skipping 289 matching lines @@
     return null;
   }
 
   /**
    * Return the lexical identifiers associated with the given [identifiers].
    */
   static List<String> _getIdentifiers(NodeList<SimpleIdentifier> identifiers) {
     return identifiers.map((identifier) => identifier.name).toList();
   }
 }