Visit name of DartDeclaration, set Element for DartIdentifier

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

Index: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/ast/DartElementLocatorTest.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/ast/DartElementLocatorTest.java b/editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/ast/DartElementLocatorTest.java
index d0425d0a6b5b03d1c6254a4a6aa30df5701703ca..34bc8d656a5c0100b8c0e8a8a4f36f4f77709e05 100644
--- a/editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/ast/DartElementLocatorTest.java
+++ b/editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/ast/DartElementLocatorTest.java
@@ -13,56 +13,66 @@
  */
 package com.google.dart.tools.core.utilities.ast;
 
-import static com.google.dart.tools.core.test.util.MoneyProjectUtilities.getMoneyCompilationUnit;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.tools.core.model.CompilationUnit;
 import com.google.dart.tools.core.model.DartElement;
-import com.google.dart.tools.core.model.DartModelException;
 import com.google.dart.tools.core.utilities.compiler.DartCompilerUtilities;
 
 import junit.framework.TestCase;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class DartElementLocatorTest extends TestCase {
 
-  public void test_VariableElement_parameter_inClassMethod() throws Exception {
-    testElementLocator(new String[]{
-        "// filler filler filler filler filler filler filler filler filler filler filler",
-        "process(x) {}",
-        "class A {",
-        "  foo(a, bb, ccc) {",
-        "    process(bb);",
-        "  }",
-        "}"}, "bb);", "bb, ", 2);
-  }
-
-  public void test_VariableElement_parameter_inTopMethod() throws Exception {
-    testElementLocator(new String[]{
-        "// filler filler filler filler filler filler filler filler filler filler filler",
-        "process(x) {}",
-        "foo(a, bb, ccc) {",
-        "  process(bb);",
-        "}"}, "bb);", "bb, ", 2);
+  private static void assertLocation(CompilationUnit unit, String posMarker, String expectedMarker,
+      int expectedLen) throws Exception {
+    String source = unit.getSource();
+    // prepare DartUnit
+    DartUnit dartUnit;
+    {
+      List<DartCompilationError> errors = Lists.newArrayList();
+      dartUnit = DartCompilerUtilities.resolveUnit(unit, errors);
+      // we don't want errors
+      if (!errors.isEmpty()) {
+        fail("Parse/resolve errors: " + errors);
+      }
+    }
+    // prepare position to search on
+    int pos = source.indexOf(posMarker);
+    assertTrue("Unable to find position marker '" + posMarker + "'", pos > 0);
+    // use Locator
+    DartElementLocator locator = new DartElementLocator(unit, pos, true);
+    DartElement result = locator.searchWithin(dartUnit);
+    // verify
+    if (expectedMarker != null) {
+      assertNotNull(result);
+      int expectedPos = source.indexOf(expectedMarker);
+      assertTrue("Unable to find expected marker '" + expectedMarker + "'", expectedPos > 0);
+      assertEquals(expectedPos, locator.getCandidateRegion().getOffset());
+      assertEquals(expectedLen, locator.getCandidateRegion().getLength());
+    } else {
+      assertNull(result);
+    }
   }
 
-  public void test_VariableElement_localVariable() throws Exception {
-    testElementLocator(new String[]{
+  public void test_FieldElement_classMember() throws Exception {
+    testElementLocator(new String[] {
         "// filler filler filler filler filler filler filler filler filler filler filler",
         "process(x) {}",
+        "class A {",
+        "  var bbb = 1;",
+        "}",
         "foo() {",
-        "  var aaa = 1;",
-        "  process(aaa);",
-        "}"}, "aaa);", "aaa = 1", 3);
+        "  A a = new A();",
+        "  process(a.bbb);",
+        "}"}, "bbb);", "bbb = 1", 3);
   }
 
   public void test_FieldElement_topLevel() throws Exception {
-    testElementLocator(new String[]{
+    testElementLocator(new String[] {
         "// filler filler filler filler filler filler filler filler filler filler filler",
         "process(x) {}",
         "var aaa = 1;",
@@ -71,21 +81,28 @@ public class DartElementLocatorTest extends TestCase {
         "}"}, "aaa);", "aaa = 1", 3);
   }
 
-  public void test_FieldElement_classMember() throws Exception {
-    testElementLocator(new String[]{
+  public void test_methodInvocation() throws Exception {
+    testElementLocator(new String[] {
+        "// filler filler filler filler filler filler filler filler filler filler filler",
+        "foo() {}",
+        "bar() {",
+        "  foo();",
+        "}"}, "foo();", "foo() {}", 3);
+  }
+
+  public void test_type_newExpression() throws Exception {
+    testElementLocator(new String[] {
         "// filler filler filler filler filler filler filler filler filler filler filler",
-        "process(x) {}",
         "class A {",
-        "  var bbb = 1;",
+        "  A() {}",
         "}",
         "foo() {",
         "  A a = new A();",
-        "  process(a.bbb);",
-        "}"}, "bbb);", "bbb = 1", 3);
+        "}"}, "A();", "A() {}", 1);
   }
 
   public void test_type_typeName() throws Exception {
-    testElementLocator(new String[]{
+    testElementLocator(new String[] {
         "// filler filler filler filler filler filler filler filler filler filler filler",
         "class A {}",
         "foo() {",
@@ -93,99 +110,46 @@ public class DartElementLocatorTest extends TestCase {
         "}"}, "A a =", "A {}", 1);
   }
 
-  public void test_type_newExpression() throws Exception {
-    testElementLocator(new String[]{
+  public void test_VariableElement_localVariable() throws Exception {
+    testElementLocator(new String[] {
         "// filler filler filler filler filler filler filler filler filler filler filler",
-        "class A {",
-        "  A() {}",
-        "}",
+        "process(x) {}",
         "foo() {",
-        "  A a = new A();",
-        "}"}, "A();", "A() {}", 1);
+        "  var aaa = 1;",
+        "  process(aaa);",
+        "}"}, "aaa);", "aaa = 1", 3);
   }
 
-  public void test_methodInvocation() throws Exception {
-    testElementLocator(new String[]{
+  public void test_VariableElement_parameter_inClassMethod() throws Exception {
+    testElementLocator(new String[] {
         "// filler filler filler filler filler filler filler filler filler filler filler",
-        "foo() {}",
-        "bar() {",
-        "  foo();",
-        "}"}, "foo();", "foo() {}", 3);
+        "process(x) {}",
+        "class A {",
+        "  foo(a, bb, ccc) {",
+        "    process(bb);",
+        "  }",
+        "}"}, "bb);", "bb, ", 2);
+  }
+
+  public void test_VariableElement_parameter_inTopMethod() throws Exception {
+    testElementLocator(new String[] {
+        "// filler filler filler filler filler filler filler filler filler filler filler",
+        "process(x) {}",
+        "foo(a, bb, ccc) {",
+        "  process(bb);",
+        "}"}, "bb);", "bb, ", 2);
   }
 
-  private void testElementLocator(String[] sourceLines,
-      String posMarker,
-      String expectedMarker,
+  private void testElementLocator(String[] sourceLines, String posMarker, String expectedMarker,
       int expectedLen) throws Exception {
     TestProject testProject = new TestProject("Test");
     try {
-      CompilationUnit unit =
-          testProject.setUnitContent("Test.dart", Joiner.on("\n").join(sourceLines));
+      CompilationUnit unit = testProject.setUnitContent(
+          "Test.dart",
+          Joiner.on("\n").join(sourceLines));
       assertLocation(unit, posMarker, expectedMarker, expectedLen);
     } finally {
       testProject.dispose();
     }
   }
-
-  private static void assertLocation(CompilationUnit unit,
-      String posMarker,
-      String expectedMarker,
-      int expectedLen) throws Exception {
-    String source = unit.getSource();
-    // prepare DartUnit
-    DartUnit dartUnit;
-    {
-      List<DartCompilationError> errors = Lists.newArrayList();
-      dartUnit = DartCompilerUtilities.resolveUnit(unit, errors);
-      // we don't want errors
-      if (!errors.isEmpty()) {
-        fail("Parse/resolve errors: " + errors);
-      }
-    }
-    // prepare position to search on
-    int pos = source.indexOf(posMarker);
-    assertTrue("Unable to find position marker '" + posMarker + "'", pos > 0);
-    // use Locator
-    DartElementLocator locator = new DartElementLocator(unit, pos, true);
-    DartElement result = locator.searchWithin(dartUnit);
-    // verify
-    if (expectedMarker != null) {
-      assertNotNull(result);
-      int expectedPos = source.indexOf(expectedMarker);
-      assertTrue("Unable to find expected marker '" + expectedMarker + "'", expectedPos > 0);
-      assertEquals(expectedPos, locator.getCandidateRegion().getOffset());
-      assertEquals(expectedLen, locator.getCandidateRegion().getLength());
-    } else {
-      assertNull(result);
-    }
-  }
-
-  public void test_DartElementLocator_searchWithin_declaration_with() throws Exception {
-    CompilationUnit unit = getMoneyCompilationUnit("simple_money.dart");
-    assertLocation(true, unit, 418, true);
-  }
-
-  public void test_DartElementLocator_searchWithin_declaration_without() throws Exception {
-    CompilationUnit unit = getMoneyCompilationUnit("simple_money.dart");
-    assertLocation(false, unit, 418, false);
-  }
-
-  public void test_DartElementLocator_searchWithin_reference() throws Exception {
-    CompilationUnit unit = getMoneyCompilationUnit("simple_money.dart");
-    assertLocation(true, unit, 394, false);
-  }
-
-  private void assertLocation(boolean expectElement,
-      CompilationUnit unit,
-      int offset,
-      boolean includeDeclarations) throws DartModelException {
-    DartUnit ast = DartCompilerUtilities.resolveUnit(unit, new ArrayList<DartCompilationError>());
-    DartElementLocator locator = new DartElementLocator(unit, offset, includeDeclarations);
-    DartElement result = locator.searchWithin(ast);
-    if (expectElement) {
-      assertNotNull(result);
-    } else {
-      assertNull(result);
-    }
-  }
 }