Rebased and retested version of CL 1915123008.

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 'dart:async';
 import 'dart:collection';
 
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 import 'package:compiler/src/constants/expressions.dart';
@@ skipping 204 matching lines @@
     String script = """class A { foo() {} }
                        class B extends A { foo() => super.foo(); }""";
     compiler.parseScript(script);
     compiler.resolveStatement("B b;");
 
     ClassElement classB = compiler.mainApp.find("B");
     FunctionElement fooB = classB.lookupLocalMember("foo");
     ClassElement classA = compiler.mainApp.find("A");
     FunctionElement fooA = classA.lookupLocalMember("foo");
 
-    ResolverVisitor visitor =
-        new ResolverVisitor(compiler, fooB,
-            new ResolutionRegistry(compiler,
-                new CollectingTreeElements(fooB)));
+    ResolverVisitor visitor = new ResolverVisitor(
+        compiler,
+        fooB,
+        new ResolutionRegistry(compiler, new CollectingTreeElements(fooB)),
+        scope: new MockTypeVariablesScope(classB.buildScope()));
     FunctionExpression node =
         (fooB as FunctionElementX).parseNode(compiler.parsingContext);
     visitor.visit(node.body);
     Map mapping = map(visitor);
 
     Send superCall = node.body.asReturn().expression;
     FunctionElement called = mapping[superCall];
     Expect.isNotNull(called);
     Expect.equals(fooA, called);
   });
@@ skipping 20 matching lines @@
   });
 }
 
 Future testThis() {
   return Future.wait([
     MockCompiler.create((MockCompiler compiler) {
       compiler.parseScript("class Foo { foo() { return this; } }");
       compiler.resolveStatement("Foo foo;");
       ClassElement fooElement = compiler.mainApp.find("Foo");
       FunctionElement funElement = fooElement.lookupLocalMember("foo");
-      ResolverVisitor visitor =
-          new ResolverVisitor(compiler, funElement,
-              new ResolutionRegistry(compiler,
-                  new CollectingTreeElements(funElement)));
+      ResolverVisitor visitor = new ResolverVisitor(
+          compiler,
+          funElement,
+          new ResolutionRegistry(
+              compiler, new CollectingTreeElements(funElement)),
+          scope: new MockTypeVariablesScope(fooElement.buildScope()));
       FunctionExpression function =
           (funElement as FunctionElementX).parseNode(compiler.parsingContext);
       visitor.visit(function.body);
       Map mapping = map(visitor);
       List<Element> values = mapping.values.toList();
       DiagnosticCollector collector = compiler.diagnosticCollector;
       Expect.equals(0, mapping.length);
       Expect.equals(0, collector.warnings.length);
     }),
     MockCompiler.create((MockCompiler compiler) {
       compiler.resolveStatement("main() { return this; }");
       DiagnosticCollector collector = compiler.diagnosticCollector;
       Expect.equals(0, collector.warnings.length);
       Expect.equals(1, collector.errors.length);
       Expect.equals(MessageKind.NO_INSTANCE_AVAILABLE,
                     collector.errors.first.message.kind);
     }),
     MockCompiler.create((MockCompiler compiler) {
       compiler.parseScript("class Foo { static foo() { return this; } }");
       compiler.resolveStatement("Foo foo;");
       ClassElement fooElement = compiler.mainApp.find("Foo");
       FunctionElement funElement = fooElement.lookupLocalMember("foo");
-      ResolverVisitor visitor = new ResolverVisitor(compiler, funElement,
-          new ResolutionRegistry(compiler,
-              new CollectingTreeElements(funElement)));
+      ResolverVisitor visitor = new ResolverVisitor(
+          compiler,
+          funElement,
+          new ResolutionRegistry(
+              compiler, new CollectingTreeElements(funElement)),
+          scope: new MockTypeVariablesScope(fooElement.buildScope()));
       FunctionExpression function =
           (funElement as FunctionElementX).parseNode(compiler.parsingContext);
       visitor.visit(function.body);
       DiagnosticCollector collector = compiler.diagnosticCollector;
       Expect.equals(0, collector.warnings.length);
       Expect.equals(1, collector.errors.length);
       Expect.equals(MessageKind.NO_INSTANCE_AVAILABLE,
                     collector.errors.first.message.kind);
     }),
   ]);
@@ skipping 266 matching lines @@
         new Message(
             MessageTemplate.TEMPLATES[MessageKind.CANNOT_RESOLVE_TYPE],
             {'typeName': 'bar'}, false),
         collector.errors.first.message);
     collector.clear();
 
     // 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 ResolutionRegistry(compiler,
-                new CollectingTreeElements(null)));
+    ResolverVisitor visitor = new ResolverVisitor(
+        compiler,
+        null,
+        new ResolutionRegistry(compiler, new CollectingTreeElements(null)));
     compiler.resolveStatement("Foo bar;");
 
     ClassElement fooElement = compiler.mainApp.find('Foo');
     ClassElement barElement = compiler.mainApp.find('Bar');
 
     Expect.equals(null, barElement.supertype);
     Expect.isTrue(barElement.interfaces.isEmpty);
 
     Expect.equals(barElement.computeType(compiler.resolution),
                   fooElement.interfaces.head);
@@ skipping 14 matching lines @@
     ClassElement i2 = compiler.mainApp.find('I2');
 
     Expect.equals(2, length(c.interfaces));
     Expect.equals(i1.computeType(compiler.resolution), at(c.interfaces, 0));
     Expect.equals(i2.computeType(compiler.resolution), at(c.interfaces, 1));
   });
 }
 
 Future testFunctionExpression() {
   return MockCompiler.create((MockCompiler compiler) {
-    ResolverVisitor visitor = compiler.resolverVisitor();
     Map mapping = compiler.resolveStatement("int f() {}").map;
     Expect.equals(2, mapping.length);
     Element element;
     Node node;
     mapping.forEach((Node n, Element e) {
       if (n is FunctionExpression) {
         element = e;
         node = n;
       }
     });
@@ skipping 61 matching lines @@
      List expectedInfos: const [],
      Map<String, String> corelib}) {
   MockCompiler compiler = new MockCompiler.internal(coreSource: corelib);
   return compiler.init().then((_) {
     compiler.parseScript(script);
     compiler.resolveStatement(statement);
     ClassElement classElement = compiler.mainApp.find(className);
     Element element;
     element = classElement.lookupConstructor(constructor);
     FunctionExpression tree = (element as FunctionElement).node;
-    ResolverVisitor visitor =
-        new ResolverVisitor(compiler, element,
-            new ResolutionRegistry(compiler,
-                new CollectingTreeElements(element)));
+    ResolverVisitor visitor = new ResolverVisitor(
+        compiler,
+        element,
+        new ResolutionRegistry(compiler, new CollectingTreeElements(element)),
+        scope: classElement.buildScope());
     new InitializerResolver(visitor, element, tree).resolveInitializers();
     visitor.visit(tree.body);
     Expect.equals(expectedElementCount, map(visitor).length,
         "${map(visitor).values} for '$statement' in context of `$script`");
 
     DiagnosticCollector collector = compiler.diagnosticCollector;
     compareWarningKinds(script, expectedWarnings, collector.warnings);
     compareWarningKinds(script, expectedErrors, collector.errors);
     compareWarningKinds(script, expectedInfos, collector.infos);
   });
@@ skipping 723 matching lines @@
     }
     main() => A.m();
   ''', functionName: 'm');
   check('''
     class A {
       m() => () => await - 3;
     }
     main() => new A().m();
   ''', className: 'A');
 }