Cherry-pick r44410 and r44412

editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/VariableResolverVisitor.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.engine.internal.resolver;
 
 import com.google.dart.engine.ast.AstNode;
 import com.google.dart.engine.ast.ConstructorName;
 import com.google.dart.engine.ast.ExportDirective;
 import com.google.dart.engine.ast.FunctionDeclaration;
 import com.google.dart.engine.ast.FunctionExpression;
 import com.google.dart.engine.ast.ImportDirective;
 import com.google.dart.engine.ast.Label;
+import com.google.dart.engine.ast.MethodDeclaration;
 import com.google.dart.engine.ast.MethodInvocation;
 import com.google.dart.engine.ast.PrefixedIdentifier;
 import com.google.dart.engine.ast.PropertyAccess;
 import com.google.dart.engine.ast.SimpleIdentifier;
 import com.google.dart.engine.element.Element;
 import com.google.dart.engine.element.ElementKind;
 import com.google.dart.engine.element.ExecutableElement;
 import com.google.dart.engine.element.LibraryElement;
 import com.google.dart.engine.element.VariableElement;
 import com.google.dart.engine.error.AnalysisErrorListener;
@@ skipping 83 matching lines @@
       return super.visitFunctionExpression(node);
     }
   }
 
   @Override
   public Void visitImportDirective(ImportDirective node) {
     return null;
   }
 
   @Override
+  public Void visitMethodDeclaration(MethodDeclaration node) {
+    ExecutableElement outerFunction = enclosingFunction;
+    try {
+      enclosingFunction = node.getElement();
+      return super.visitMethodDeclaration(node);
+    } finally {
+      enclosingFunction = outerFunction;
+    }
+  }
+
+  @Override
   public Void visitSimpleIdentifier(SimpleIdentifier node) {
     // Ignore if already resolved - declaration or type.
     if (node.getStaticElement() != null) {
       return null;
     }
     // Ignore if qualified.
     AstNode parent = node.getParent();
     if (parent instanceof PrefixedIdentifier
         && ((PrefixedIdentifier) parent).getIdentifier() == node) {
       return null;
@@ skipping 34 matching lines @@
         // If we are in some closure, check if it is not the same as where variable is declared.
         if (enclosingFunction != null
             && !ObjectUtilities.equals(element.getEnclosingElement(), enclosingFunction)) {
           parameterImpl.markPotentiallyMutatedInClosure();
         }
       }
     }
     return null;
   }
 }