Extend resolution Scope with ResolutionContext and set it for ResolverVisitor.

pkg/analyzer/test/generated/incremental_resolver_test.dart

Index: pkg/analyzer/test/generated/incremental_resolver_test.dart
diff --git a/pkg/analyzer/test/generated/incremental_resolver_test.dart b/pkg/analyzer/test/generated/incremental_resolver_test.dart
index 27f5e67452668e97a4a5a19fd4c2a8311026f1ad..79330916eb05e9a90ba1741b1d125276cffcca98 100644
--- a/pkg/analyzer/test/generated/incremental_resolver_test.dart
+++ b/pkg/analyzer/test/generated/incremental_resolver_test.dart
@@ -28,7 +28,7 @@ main() {
   groupSep = ' | ';
   runReflectiveTests(DeclarationMatcherTest);
   runReflectiveTests(IncrementalResolverTest);
-  runReflectiveTests(ScopeBuilderTest);
+  runReflectiveTests(ResolutionContextBuilderTest);
 }
 
 
@@ -1100,18 +1100,6 @@ class A {
     _resolve(_editString(');', ') : f = a + b;'), _isClassMember);
   }
 
-  void fail_test_constructor_fieldInitializer_edit() {
-    // TODO(scheglov) resolver uses "enclosingClass", which we don't set yet
-    _resolveUnit(r'''
-class A {
-  int f;
-  A(int a, int b) : f = a + b {
-    int a = 42;
-  }
-}''');
-    _resolve(_editString('+', '*'), _isExpression);
-  }
-
   void fail_test_topLevelFunction_parameter_rename() {
     // TODO(scheglov) Decide if incremental parser keeps the element
     // of the function. If so, we can resolve parameter renames.
@@ -1136,6 +1124,18 @@ class A {
     _resolve(_editString('+', '*'), _isFunctionBody);
   }
 
+  void test_constructor_fieldInitializer_edit() {
+    // TODO(scheglov) resolver uses "enclosingClass", which we don't set yet
+    _resolveUnit(r'''
+class A {
+  int f;
+  A(int a, int b) : f = a + b {
+    int a = 42;
+  }
+}''');
+    _resolve(_editString('+', '*'), _isExpression);
+  }
+
   void test_constructor_superConstructorInvocation() {
     _resolveUnit(r'''
 class A {
@@ -1362,11 +1362,11 @@ class B {
 }
 
 
-class ScopeBuilderTest extends EngineTestCase {
+class ResolutionContextBuilderTest extends EngineTestCase {
+  GatheringErrorListener listener = new GatheringErrorListener();
+
   void test_scopeFor_ClassDeclaration() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedClassDeclaration(), listener);
+    Scope scope = _scopeFor(_createResolvedClassDeclaration());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
         LibraryScope,
@@ -1374,9 +1374,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_ClassTypeAlias() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedClassTypeAlias(), listener);
+    Scope scope = _scopeFor(_createResolvedClassTypeAlias());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
         LibraryScope,
@@ -1384,9 +1382,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_CompilationUnit() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedCompilationUnit(), listener);
+    Scope scope = _scopeFor(_createResolvedCompilationUnit());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
         LibraryScope,
@@ -1394,9 +1390,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_ConstructorDeclaration() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedConstructorDeclaration(), listener);
+    Scope scope = _scopeFor(_createResolvedConstructorDeclaration());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is ClassScope,
         ClassScope,
@@ -1404,10 +1398,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_ConstructorDeclaration_parameters() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope = ScopeBuilder.scopeFor(
-        _createResolvedConstructorDeclaration().parameters,
-        listener);
+    Scope scope = _scopeFor(_createResolvedConstructorDeclaration().parameters);
     EngineTestCase.assertInstanceOf(
         (obj) => obj is FunctionScope,
         FunctionScope,
@@ -1415,9 +1406,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_FunctionDeclaration() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedFunctionDeclaration(), listener);
+    Scope scope = _scopeFor(_createResolvedFunctionDeclaration());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
         LibraryScope,
@@ -1425,10 +1414,8 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_FunctionDeclaration_parameters() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope = ScopeBuilder.scopeFor(
-        _createResolvedFunctionDeclaration().functionExpression.parameters,
-        listener);
+    Scope scope =
+        _scopeFor(_createResolvedFunctionDeclaration().functionExpression.parameters);
     EngineTestCase.assertInstanceOf(
         (obj) => obj is FunctionScope,
         FunctionScope,
@@ -1436,9 +1423,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_FunctionTypeAlias() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedFunctionTypeAlias(), listener);
+    Scope scope = _scopeFor(_createResolvedFunctionTypeAlias());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is LibraryScope,
         LibraryScope,
@@ -1446,9 +1431,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_FunctionTypeAlias_parameters() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedFunctionTypeAlias().parameters, listener);
+    Scope scope = _scopeFor(_createResolvedFunctionTypeAlias().parameters);
     EngineTestCase.assertInstanceOf(
         (obj) => obj is FunctionTypeScope,
         FunctionTypeScope,
@@ -1456,9 +1439,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_MethodDeclaration() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedMethodDeclaration(), listener);
+    Scope scope = _scopeFor(_createResolvedMethodDeclaration());
     EngineTestCase.assertInstanceOf(
         (obj) => obj is ClassScope,
         ClassScope,
@@ -1466,9 +1447,7 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_MethodDeclaration_body() {
-    GatheringErrorListener listener = new GatheringErrorListener();
-    Scope scope =
-        ScopeBuilder.scopeFor(_createResolvedMethodDeclaration().body, listener);
+    Scope scope = _scopeFor(_createResolvedMethodDeclaration().body);
     EngineTestCase.assertInstanceOf(
         (obj) => obj is FunctionScope,
         FunctionScope,
@@ -1476,9 +1455,8 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_notInCompilationUnit() {
-    GatheringErrorListener listener = new GatheringErrorListener();
     try {
-      ScopeBuilder.scopeFor(AstFactory.identifier3("x"), listener);
+      _scopeFor(AstFactory.identifier3("x"));
       fail("Expected AnalysisException");
     } on AnalysisException catch (exception) {
       // Expected
@@ -1486,9 +1464,8 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_null() {
-    GatheringErrorListener listener = new GatheringErrorListener();
     try {
-      ScopeBuilder.scopeFor(null, listener);
+      _scopeFor(null);
       fail("Expected AnalysisException");
     } on AnalysisException catch (exception) {
       // Expected
@@ -1496,9 +1473,8 @@ class ScopeBuilderTest extends EngineTestCase {
   }
 
   void test_scopeFor_unresolved() {
-    GatheringErrorListener listener = new GatheringErrorListener();
     try {
-      ScopeBuilder.scopeFor(AstFactory.compilationUnit(), listener);
+      _scopeFor(AstFactory.compilationUnit());
       fail("Expected AnalysisException");
     } on AnalysisException catch (exception) {
       // Expected
@@ -1618,6 +1594,10 @@ class ScopeBuilderTest extends EngineTestCase {
         <MethodElement>[methodElement];
     return methodNode;
   }
+
+  Scope _scopeFor(AstNode node) {
+    return ResolutionContextBuilder.contextFor(node, listener).scope;
+  }
 }