Revert "Refactoring resolution of local access and unqualified access of statics"

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:async';
 import "package:async_helper/async_helper.dart";
 import 'dart:collection';
 
 import "package:compiler/src/resolution/resolution.dart";
@@ skipping 319 matching lines @@
 }
 
 Future testLocalsThree() {
   return MockCompiler.create((MockCompiler compiler) {
     ResolverVisitor visitor = compiler.resolverVisitor();
     Node tree = parseStatement("{ var a = 1; if (true) { a; } }");
     ResolutionResult element = visitor.visit(tree);
     Expect.equals(null, element);
     MethodScope scope = visitor.scope;
     Expect.equals(0, scope.elements.length);
-    Expect.equals(2, map(visitor).length);
+    Expect.equals(3, map(visitor).length);
     List<Element> elements = map(visitor).values.toList();
     Expect.equals(elements[0], elements[1]);
   });
 }
 
 Future testLocalsFour() {
   return MockCompiler.create((MockCompiler compiler) {
     ResolverVisitor visitor = compiler.resolverVisitor();
     Node tree = parseStatement("{ var a = 1; if (true) { var a = 1; } }");
     ResolutionResult element = visitor.visit(tree);
     Expect.equals(null, element);
     MethodScope scope = visitor.scope;
     Expect.equals(0, scope.elements.length);
     Expect.equals(2, map(visitor).length);
     List<Element> elements = map(visitor).values.toList();
     Expect.notEquals(elements[0], elements[1]);
   });
 }
 
 Future testLocalsFive() {
   return MockCompiler.create((MockCompiler compiler) {
     ResolverVisitor visitor = compiler.resolverVisitor();
     If tree =
         parseStatement("if (true) { var a = 1; a; } else { var a = 2; a;}");
     ResolutionResult element = visitor.visit(tree);
     Expect.equals(null, element);
     MethodScope scope = visitor.scope;
     Expect.equals(0, scope.elements.length);
-    Expect.equals(4, map(visitor).length);
+    Expect.equals(6, map(visitor).length);
 
     Block thenPart = tree.thenPart;
     List statements1 = thenPart.statements.nodes.toList();
     Node def1 = statements1[0].definitions.nodes.head;
     Node id1 = statements1[1].expression;
     Expect.equals(visitor.registry.mapping[def1],
                   visitor.registry.mapping[id1]);
 
     Block elsePart = tree.elsePart;
     List statements2 = elsePart.statements.nodes.toList();
@@ skipping 32 matching lines @@
 }
 
 Future testFor() {
   return MockCompiler.create((MockCompiler compiler) {
     ResolverVisitor visitor = compiler.resolverVisitor();
     For tree = parseStatement("for (int i = 0; i < 10; i = i + 1) { i = 5; }");
     visitor.visit(tree);
 
     MethodScope scope = visitor.scope;
     Expect.equals(0, scope.elements.length);
-    Expect.equals(7, map(visitor).length);
+    Expect.equals(9, map(visitor).length);
 
     VariableDefinitions initializer = tree.initializer;
     Node iNode = initializer.definitions.nodes.head;
     Element iElement = visitor.registry.mapping[iNode];
 
     // Check that we have the expected nodes. This test relies on the mapping
     // field to be a linked hash map (preserving insertion order).
     Expect.isTrue(map(visitor) is LinkedHashMap);
     List<Node> nodes = map(visitor).keys.toList();
     List<Element> elements = map(visitor).values.toList();
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //          ^^^^^
     checkSendSet(iElement, nodes[0], elements[0]);
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //                 ^
-    checkSend(iElement, nodes[1], elements[1]);
+    checkIdentifier(iElement, nodes[1], elements[1]);
+
+    // for (int i = 0; i < 10; i = i + 1) { i = 5; };
+    //                 ^
+    checkSend(iElement, nodes[2], elements[2]);
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //                         ^
-    checkIdentifier(iElement, nodes[2], elements[2]);
+    checkIdentifier(iElement, nodes[3], elements[3]);
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //                             ^
-    checkSend(iElement, nodes[3], elements[3]);
+    checkIdentifier(iElement, nodes[4], elements[4]);
+
+    // for (int i = 0; i < 10; i = i + 1) { i = 5; };
+    //                             ^
+    checkSend(iElement, nodes[5], elements[5]);
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //                         ^^^^^^^^^
-    checkSendSet(iElement, nodes[4], elements[4]);
+    checkSendSet(iElement, nodes[6], elements[6]);
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //                                      ^
-    checkIdentifier(iElement, nodes[5], elements[5]);
+    checkIdentifier(iElement, nodes[7], elements[7]);
 
     // for (int i = 0; i < 10; i = i + 1) { i = 5; };
     //                                      ^^^^^
-    checkSendSet(iElement, nodes[6], elements[6]);
+    checkSendSet(iElement, nodes[8], elements[8]);
   });
 }
 
 checkIdentifier(Element expected, Node node, Element actual) {
   Expect.isTrue(node is Identifier, node.toDebugString());
   Expect.equals(expected, actual);
 }
 
 checkSend(Element expected, Node node, Element actual) {
   Expect.isTrue(node is Send, node.toDebugString());
@@ skipping 441 matching lines @@
           expectedWarnings: [],
           expectedErrors: [MessageKind.CANNOT_RESOLVE]);
     },
     () {
       String script =
           """class A {
                int foo;
                int bar;
                A() : this.foo = bar;
              }""";
-      return resolveConstructor(script, "A a = new A();", "A", "", 2,
+      return resolveConstructor(script, "A a = new A();", "A", "", 3,
           expectedWarnings: [],
           expectedErrors: [MessageKind.NO_INSTANCE_AVAILABLE]);
     },
     () {
       String script =
           """class A {
                int foo() => 42;
                A() : foo();
              }""";
       return resolveConstructor(script, "A a = new A();", "A", "", 0,
@@ skipping 391 matching lines @@
     }
     main() => A.m();
   ''', functionName: 'm');
   check('''
     class A {
       m() => () => await - 3;
     }
     main() => new A().m();
   ''', className: 'A');
 }