Issue 1355. Support for call(). Tweaks for element locator and rename refactoring

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/ast/DartElementLocator.java

 /*
  * Copyright (c) 2012, 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.tools.core.utilities.ast;
 
 import com.google.common.base.Objects;
 import com.google.dart.compiler.DartSource;
 import com.google.dart.compiler.LibrarySource;
 import com.google.dart.compiler.ast.ASTVisitor;
 import com.google.dart.compiler.ast.DartArrayAccess;
 import com.google.dart.compiler.ast.DartBinaryExpression;
 import com.google.dart.compiler.ast.DartExpression;
 import com.google.dart.compiler.ast.DartIdentifier;
 import com.google.dart.compiler.ast.DartImportDirective;
 import com.google.dart.compiler.ast.DartNode;
 import com.google.dart.compiler.ast.DartResourceDirective;
 import com.google.dart.compiler.ast.DartSourceDirective;
 import com.google.dart.compiler.ast.DartStringLiteral;
 import com.google.dart.compiler.ast.DartUnaryExpression;
+import com.google.dart.compiler.ast.DartUnqualifiedInvocation;
 import com.google.dart.compiler.resolver.Element;
 import com.google.dart.compiler.resolver.ElementKind;
 import com.google.dart.compiler.resolver.LibraryElement;
+import com.google.dart.compiler.resolver.NodeElement;
 import com.google.dart.compiler.resolver.VariableElement;
 import com.google.dart.tools.core.DartCore;
 import com.google.dart.tools.core.internal.util.SourceRangeUtils;
 import com.google.dart.tools.core.model.CompilationUnit;
 import com.google.dart.tools.core.model.DartElement;
 import com.google.dart.tools.core.model.DartImport;
 import com.google.dart.tools.core.model.DartLibrary;
 import com.google.dart.tools.core.model.DartModelException;
 import com.google.dart.tools.core.model.DartResource;
 import com.google.dart.tools.core.model.SourceRange;
@@ skipping 382 matching lines @@
         DartExpression operand = node.getArg();
         wordRegion = computeOperatorRegion(start, operand.getSourceInfo().getOffset() - 1);
         Element targetSymbol = node.getElement();
         findElementFor(targetSymbol);
         throw new DartElementFoundException();
       }
     }
     return null;
   }
 
+  @Override
+  public Void visitUnqualifiedInvocation(DartUnqualifiedInvocation node) {
+    super.visitUnqualifiedInvocation(node);
+    if (foundElement == null) {

[Brian Wilkerson, 2012/06/18 20:46:18]

This doesn't test to ensure that the node is within the target range.

+      NodeElement invocationElement = node.getElement();
+      if (invocationElement != null && node.getTarget() != null
+          && node.getTarget().getElement() != invocationElement) {
+        findElementFor(invocationElement);
+      }
+    }
+    return null;
+  }
+
   /**
    * Compute a region that represents the portion of the string literal between the opening and
    * closing quotes.
    * 
    * @param nodeStart the index of the first character of the string literal
    * @param nodeLength the length of the string literal (including quotes)
    * @return the region that was computed
    */
   private IRegion computeInternalStringRegion(int nodeStart, int nodeLength) {
     int start = nodeStart;
@@ skipping 96 matching lines @@
    */
   private String getFileName(DartLibrary library, String uri) {
     int index = uri.lastIndexOf('/');
     if (index >= 0) {
       return uri.substring(index + 1);
     }
     return uri;
   }
 
 }