Issue 21850. Fix for incremental resolving field formal parameters.

pkg/analyzer/lib/src/generated/incremental_resolver.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 engine.incremental_resolver;
 
 import 'dart:collection';
 import 'dart:math' as math;
 
 import 'ast.dart';
@@ skipping 171 matching lines @@
     SimpleIdentifier constructorName = node.name;
     ConstructorElementImpl element = constructorName == null ?
         _enclosingClass.unnamedConstructor :
         _enclosingClass.getNamedConstructor(constructorName.name);
     _processElement(element);
     _assertCompatibleParameters(node.parameters, element.parameters);
     // matches, update the existing element
     ExecutableElement newElement = node.element;
     node.element = element;
     _setLocalElements(element, newElement);
-    _setParameterElements(node.parameters, element.parameters);
   }
 
   @override
   visitEnumConstantDeclaration(EnumConstantDeclaration node) {
     String name = node.name.name;
     FieldElement element = _findElement(_enclosingClass.fields, name);
     _processElement(element);
   }
 
   @override
@@ skipping 57 matching lines @@
     _assertFalse(element.isSynthetic);
     _assertSameType(node.returnType, element.returnType);
     _assertCompatibleParameters(
         node.functionExpression.parameters,
         element.parameters);
     // matches, update the existing element
     ExecutableElement newElement = node.element;
     node.name.staticElement = element;
     node.functionExpression.element = element;
     _setLocalElements(element, newElement);
-    _setParameterElements(
-        node.functionExpression.parameters,
-        element.parameters);
   }
 
   @override
   visitFunctionTypeAlias(FunctionTypeAlias node) {
     String name = node.name.name;
     FunctionTypeAliasElement element =
         _findElement(_enclosingUnit.functionTypeAliases, name);
     _processElement(element);
     _assertSameTypeParameters(node.typeParameters, element.typeParameters);
     _assertSameType(node.returnType, element.returnType);
@@ skipping 51 matching lines @@
     ExecutableElement newElement = node.element;
     try {
       _assertNotNull(element);
       _assertEquals(node.isStatic, element.isStatic);
       _assertSameType(node.returnType, element.returnType);
       _assertCompatibleParameters(node.parameters, element.parameters);
       _removedElements.remove(element);
       // matches, update the existing element
       node.name.staticElement = element;
       _setLocalElements(element, newElement);
-      _setParameterElements(node.parameters, element.parameters);
     } on _DeclarationMismatchException catch (e) {
       _addedElements.add(newElement);
       // remove old element
       if (element is MethodElement) {
         _enclosingClass.methods.remove(element);
       } else if (element is PropertyAccessorElement) {
         _enclosingClass.accessors.remove(element);
       }
       // add new element
       if (newElement is MethodElement) {
@@ skipping 312 matching lines @@
       return null;
     }
     return literal.stringValue;
   }
 
   static void _setLocalElements(ExecutableElementImpl to,
       ExecutableElement from) {
     to.functions = from.functions;
     to.labels = from.labels;
     to.localVariables = from.localVariables;
-  }
-
-  static void _setParameterElements(FormalParameterList nodes,
-      List<ParameterElement> elements) {
-    if (nodes != null) {
-      for (int i = 0; i < elements.length; i++) {
-        ParameterElement element = elements[i];
-        FormalParameter node = nodes.parameters[i];
-        ParameterElement newElement = node.element;
-        node.identifier.staticElement = element;
-        (element as ElementImpl).name = newElement.name;
-        (element as ElementImpl).nameOffset = newElement.nameOffset;
-        if (node is FunctionTypedFormalParameter) {
-          _setParameterElements(node.parameters, element.parameters);
-        }
-      }
-    }
+    to.parameters = from.parameters;
   }
 }
 
 
 /**
  * Describes how declarations match an existing elements model.
  */
 class DeclarationMatchKind {
   /**
    * Complete match, no API changes.
@@ skipping 116 matching lines @@
     } finally {
       logger.exit();
     }
   }
 
   void _buildElements(AstNode node) {
     LoggingTimer timer = logger.startTimer();
     try {
       ElementHolder holder = new ElementHolder();
       ElementBuilder builder = new ElementBuilder(holder);
+      if (_resolutionContext.enclosingClassDeclaration != null) {
+        builder.visitClassDeclarationIncrementally(
+            _resolutionContext.enclosingClassDeclaration);
+      }
       node.accept(builder);
     } finally {
       timer.stop('build elements');
     }
   }
 
   /**
    * Return `true` if [node] does not have element model changes, or these
    * changes can be incrementally propagated.
    */
@@ skipping 890 matching lines @@
   String toString() => name;
 }
 
 
 class _TokenPair {
   final _TokenDifferenceKind kind;
   final Token oldToken;
   final Token newToken;
   _TokenPair(this.kind, this.oldToken, this.newToken);
 }