commit 62a9c35993a16591af6cda8ce0bfffcf21c998da
author Paul Berry <stereotype441@gmail.com> Wed Oct 03 18:24:48 2018
committer GitHub <noreply@github.com> Wed Oct 03 18:24:48 2018
tree 014ddd4f658c3c4c4ff0e995b3e1beff76afff19
parent 3bb82029b8776cdc0e27a61050cbbb2707dbb795

Plumb InheritanceManager2 through AngularResolverVisitor. (#649)

This is needed to account for the changes to ResolverVisitor in
https://github.com/dart-lang/sdk/commit/80db08809ccfb3c56ca35333abdd2bbfaefcbe26.

angular_analyzer_plugin/lib/src/resolver.dart

diff --git a/angular_analyzer_plugin/lib/src/resolver.dart b/angular_analyzer_plugin/lib/src/resolver.dart
index 6815b94..f0064a9 100644
--- a/angular_analyzer_plugin/lib/src/resolver.dart
+++ b/angular_analyzer_plugin/lib/src/resolver.dart
@@ -114,10 +114,16 @@
   final bool acceptAssignment;
   final List<Pipe> pipes;
 
-  AngularResolverVisitor(LibraryElement library, Source source,
-      TypeProvider typeProvider, AnalysisErrorListener errorListener,
-      {@required this.acceptAssignment, @required this.pipes})
-      : super(library, source, typeProvider, errorListener);
+  AngularResolverVisitor(
+      InheritanceManager2 inheritanceManager2,
+      LibraryElement library,
+      Source source,
+      TypeProvider typeProvider,
+      AnalysisErrorListener errorListener,
+      {@required this.acceptAssignment,
+      @required this.pipes})
+      : super(
+            inheritanceManager2, library, source, typeProvider, errorListener);
 
   @override
   void visitAsExpression(AsExpression exp) {
@@ -1545,8 +1551,10 @@
           library, view.source, typeProvider, errorListener);
       astNode.accept(visitor);
     }
-    final resolver = new AngularResolverVisitor(
-        library, templateSource, typeProvider, errorListener,
+    final inheritanceManager2 =
+        new InheritanceManager2(typeSystem as StrongTypeSystemImpl);
+    final resolver = new AngularResolverVisitor(inheritanceManager2, library,
+        templateSource, typeProvider, errorListener,
         acceptAssignment: acceptAssignment, pipes: pipes);
     // fill the name scope
     final classScope = new ClassScope(resolver.nameScope, classElement);
@@ -1559,12 +1567,8 @@
     // do resolve
     astNode.accept(resolver);
     // verify
-    final verifier = new AngularErrorVerifier(
-        errorReporter,
-        library,
-        typeProvider,
-        new InheritanceManager(library),
-        new InheritanceManager2(typeSystem as StrongTypeSystemImpl),
+    final verifier = new AngularErrorVerifier(errorReporter, library,
+        typeProvider, new InheritanceManager(library), inheritanceManager2,
         acceptAssignment: acceptAssignment)
       ..enclosingClass = classElement;
     astNode.accept(verifier);
@@ -1936,7 +1940,12 @@
 ///
 /// See https://github.com/dart-lang/sdk/issues/15101 for details
 class _IntermediateResolverVisitor extends ResolverVisitor {
-  _IntermediateResolverVisitor(LibraryElement library, Source source,
-      TypeProvider typeProvider, AnalysisErrorListener errorListener)
-      : super(library, source, typeProvider, errorListener);
+  _IntermediateResolverVisitor(
+      InheritanceManager2 inheritanceManager2,
+      LibraryElement library,
+      Source source,
+      TypeProvider typeProvider,
+      AnalysisErrorListener errorListener)
+      : super(
+            inheritanceManager2, library, source, typeProvider, errorListener);
 }