New analyzer snapshot.

pkg/analysis_server/lib/src/services/refactoring/inline_method.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 services.src.refactoring.inline_method;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart' hide Element;
 import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart';
 import 'package:analysis_server/src/services/search/element_visitors.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
-import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 
 /**
- * Resolver sets [ParameterElement] for the most cases, but not for setter invocation.
- *
- * Returns the best available [ParameterElement] for which the given [Expression] is used.
- */
-ParameterElement _getBestParameterElement(Expression expr) {
-  // TODO(scheglov) investigate why AssignmentExpression "f = 0" doesn't have
-  // an element.
-  // setter invocation
-  if (expr.parent is AssignmentExpression) {
-    AssignmentExpression assignment = expr.parent as AssignmentExpression;
-    if (assignment.rightHandSide == expr &&
-        assignment.operator.type == TokenType.EQ) {
-      Expression lhs = assignment.leftHandSide;
-      Element lhsElement = null;
-      if (lhs is Identifier) {
-        lhsElement = lhs.bestElement;
-      }
-      if (lhs is PropertyAccess) {
-        lhsElement = lhs.propertyName.bestElement;
-      }
-      if (lhsElement is PropertyAccessorElement) {
-        List<ParameterElement> parameters = lhsElement.parameters;
-        if (parameters.length != 0) {
-          return parameters[0];
-        }
-      }
-    }
-  }
-  // use resolver
-  return expr.bestParameterElement;
-}
-
-
-/**
  * Returns the [SourceRange] to find conflicting locals in.
  */
 SourceRange _getLocalsConflictingRange(AstNode node) {
   // maybe Block
   Block block = node.getAncestor((node) => node is Block);
   if (block != null) {
     int offset = node.offset;
     int endOffset = block.end;
     return rangeStartEnd(offset, endOffset);
   }
@@ skipping 13 matching lines @@
  */
 String _getMethodSourceForInvocation(_SourcePart part, CorrectionUtils utils,
     AstNode contextNode, Expression targetExpression, List<Expression> arguments) {
   // prepare edits to replace parameters with arguments
   List<SourceEdit> edits = <SourceEdit>[];
   part._parameters.forEach(
       (ParameterElement parameter, List<_ParameterOccurrence> occurrences) {
     // prepare argument
     Expression argument = null;
     for (Expression arg in arguments) {
-      if (_getBestParameterElement(arg) == parameter) {
+      if (arg.bestParameterElement == parameter) {
         argument = arg;
         break;
       }
     }
     if (argument is NamedExpression) {
       argument = (argument as NamedExpression).expression;
     }
     int argumentPrecedence = getExpressionPrecedence(argument);
     String argumentSource = utils.getNodeText(argument);
     // replace all occurrences of this parameter
@@ skipping 702 matching lines @@
   }
 
   void _addVariable(SimpleIdentifier node) {
     VariableElement variableElement = getLocalVariableElement(node);
     if (variableElement != null) {
       SourceRange nodeRange = rangeNode(node);
       result.addVariable(variableElement, nodeRange);
     }
   }
 }