Retain elements a finer granularity than library.

dart/tests/compiler/dart2js/resolver_test.dart

 // Copyright (c) 2012, 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.
 
 import "package:expect/expect.dart";
 import 'dart:collection';
 
 import "../../../sdk/lib/_internal/compiler/implementation/resolution/resolution.dart";
 import "compiler_helper.dart";
 import "parser_helper.dart";
@@ skipping 234 matching lines @@
   testLocals([["foo", false], ["bar", true]]);
   testLocals([["foo", true], ["bar", true]]);
 
   testLocals([["foo", false], ["bar", false], ["foobar", true]]);
   testLocals([["foo", false], ["bar", true], ["foobar", true]]);
   testLocals([["foo", true], ["bar", true], ["foobar", true]]);
 
   MockCompiler compiler = testLocals([["foo", false], ["foo", false]]);
   Expect.equals(1, compiler.errors.length);
   Expect.equals(
-      new Message(MessageKind.DUPLICATE_DEFINITION, {'name': 'foo'}),
+      new Message(MessageKind.DUPLICATE_DEFINITION, {'name': 'foo'}, false),
       compiler.errors[0].message);
 }
 
 
 testLocalsTwo() {
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   Node tree = parseStatement("if (true) { var a = 1; var b = 2; }");
   Element element = visitor.visit(tree);
   Expect.equals(null, element);
@@ skipping 162 matching lines @@
   // Test that we get a warning when Foo is not defined.
   Map mapping = compiler.resolveStatement(statement).map;
 
   Expect.equals(2, mapping.length); // Both Foo and bar have an element.
   Expect.equals(1, compiler.warnings.length);
 
   Node warningNode = compiler.warnings[0].node;
 
   Expect.equals(
       new Message(
-          MessageKind.CANNOT_RESOLVE_TYPE.warning,  {'typeName': 'Foo'}),
+          MessageKind.CANNOT_RESOLVE_TYPE.warning,  {'typeName': 'Foo'}, false),
       compiler.warnings[0].message);
   VariableDefinitions definition = compiler.parsedTree;
   Expect.equals(warningNode, definition.type);
   compiler.clearWarnings();
 
   // Test that there is no warning after defining Foo.
   compiler.parseScript("class Foo {}");
   mapping = compiler.resolveStatement(statement).map;
   Expect.equals(2, mapping.length);
   Expect.equals(0, compiler.warnings.length);
 
   // Test that 'var' does not create a warning.
   mapping = compiler.resolveStatement("var foo;").map;
   Expect.equals(1, mapping.length);
   Expect.equals(0, compiler.warnings.length);
 }
 
 testSuperclass() {
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("class Foo extends Bar {}");
   compiler.resolveStatement("Foo bar;");
   // TODO(ahe): We get the same error twice: once from
   // ClassResolverVisitor, and once from ClassSupertypeResolver. We
   // should only the get the error once.
   Expect.equals(2, compiler.errors.length);
   var cannotResolveBar = new Message(MessageKind.CANNOT_RESOLVE_TYPE.error,
-                                     {'typeName': 'Bar'});
+                                     {'typeName': 'Bar'}, false);
   Expect.equals(cannotResolveBar, compiler.errors[0].message);
   Expect.equals(cannotResolveBar, compiler.errors[1].message);
   compiler.clearErrors();
 
   compiler = new MockCompiler();
   compiler.parseScript("class Foo extends Bar {}");
   compiler.parseScript("class Bar {}");
   Map mapping = compiler.resolveStatement("Foo bar;").map;
   Expect.equals(2, mapping.length);
 
   ClassElement fooElement = compiler.mainApp.find(buildSourceString('Foo'));
   ClassElement barElement = compiler.mainApp.find(buildSourceString('Bar'));
   Expect.equals(barElement.computeType(compiler),
                 fooElement.supertype);
   Expect.isTrue(fooElement.interfaces.isEmpty);
   Expect.isTrue(barElement.interfaces.isEmpty);
 }
 
 testVarSuperclass() {
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("class Foo extends var {}");
   compiler.resolveStatement("Foo bar;");
   Expect.equals(1, compiler.errors.length);
   Expect.equals(
-      new Message(MessageKind.CANNOT_RESOLVE_TYPE.warning, {'typeName': 'var'}),
+      new Message(
+          MessageKind.CANNOT_RESOLVE_TYPE.warning, {'typeName': 'var'}, false),
       compiler.errors[0].message);
   compiler.clearErrors();
 }
 
 testOneInterface() {
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("class Foo implements Bar {}");
   compiler.resolveStatement("Foo bar;");
   Expect.equals(1, compiler.errors.length);
   Expect.equals(
-      new Message(MessageKind.CANNOT_RESOLVE_TYPE.warning, {'typeName': 'bar'}),
+      new Message(
+          MessageKind.CANNOT_RESOLVE_TYPE.warning, {'typeName': 'bar'}, false),
       compiler.errors[0].message);
   compiler.clearErrors();
 
   // Add the abstract class to the world and make sure everything is setup
   // correctly.
   compiler.parseScript("abstract class Bar {}");
 
   ResolverVisitor visitor =
       new ResolverVisitor(compiler, null, new CollectingTreeElements(null));
   compiler.resolveStatement("Foo bar;");
@@ skipping 292 matching lines @@
          class Dynamic_ {}
          class Type {}
          class Object { Object() : super(); }''';
   resolveConstructor(script, "Object o = new Object();", "Object", "", 1,
                      expectedWarnings: [],
                      expectedErrors: [MessageKind.SUPER_INITIALIZER_IN_OBJECT],
                      corelib: CORELIB_WITH_INVALID_OBJECT);
 }
 
 map(ResolverVisitor visitor) {
-  TreeElementMapping elements = visitor.mapping;
+  CollectingTreeElements elements = visitor.mapping;
   return elements.map;
 }
 
 at(Link link, int index) => (index == 0) ? link.head : at(link.tail, index - 1);
 
 List<String> asSortedStrings(Link link) {
   List<String> result = <String>[];
   for (; !link.isEmpty; link = link.tail) result.add(link.head.toString());
   result.sort((s1, s2) => s1.compareTo(s2));
   return result;
 }
 
 compileScript(String source) {
   Uri uri = new Uri(scheme: 'source');
   MockCompiler compiler = compilerFor(source, uri);
   compiler.runCompiler(uri);
   return compiler;
 }
 
 checkMemberResolved(compiler, className, memberName) {
-  Element memberElement = findElement(compiler, className)
-      .lookupLocalMember(memberName);
+  ClassElement cls = findElement(compiler, className);
+  Element memberElement = cls.lookupLocalMember(memberName);
   Expect.isNotNull(memberElement);
   Expect.isNotNull(
       compiler.enqueuer.resolution.getCachedElements(memberElement));
 }
 
 testToString() {
   final script = r"class C { toString() => 'C'; } main() { '${new C()}'; }";
   final compiler = compileScript(script);
 
   checkMemberResolved(compiler, 'C', buildSourceString('toString'));
@@ skipping 51 matching lines @@
       }
       main() {
         new A() == new B();
       }""";
   final compiler = compileScript(script);
   Expect.equals(1, compiler.warnings.length);
   Expect.equals(MessageKind.OVERRIDE_EQUALS_NOT_HASH_CODE,
                 compiler.warnings[0].message.kind);
   Expect.equals(0, compiler.errors.length);
 }