commit 8407c8c66770493a96357cde077c12f83625ee73
author Michael R Fairhurst <michaelrfairhurst@gmail.com> Tue May 22 20:13:20 2018
committer GitHub <noreply@github.com> Tue May 22 20:13:20 2018
tree 2066501081c427c335c030cf6d0ac26a1fdb9488
parent 659d5b6e7fe0d75defe5cc761c49c7cecb692e18

Add pathContext to ContextRoot constructor (#577)

* Add pathContext to ContextRoot constructor

* Fix old starter

angular_analyzer_plugin/lib/plugin.dart

diff --git a/angular_analyzer_plugin/lib/plugin.dart b/angular_analyzer_plugin/lib/plugin.dart
index 0f5b531..19d986f 100644
--- a/angular_analyzer_plugin/lib/plugin.dart
+++ b/angular_analyzer_plugin/lib/plugin.dart
@@ -59,7 +59,8 @@
 
   @override
   AnalysisDriverGeneric createAnalysisDriver(plugin.ContextRoot contextRoot) {
-    final root = new ContextRoot(contextRoot.root, contextRoot.exclude)
+    final root = new ContextRoot(
+        resourceProvider.pathContext, contextRoot.root, contextRoot.exclude)
       ..optionsFilePath = contextRoot.optionsFile;
     final options = getOptions(root.optionsFilePath);
 

angular_analyzer_plugin/test/abstract_angular.dart

diff --git a/angular_analyzer_plugin/test/abstract_angular.dart b/angular_analyzer_plugin/test/abstract_angular.dart
index 04a07b5..7852494 100644
--- a/angular_analyzer_plugin/test/abstract_angular.dart
+++ b/angular_analyzer_plugin/test/abstract_angular.dart
@@ -147,7 +147,8 @@
       new ResourceUriResolver(resourceProvider)
     ]);
     final testPath = resourceProvider.convertPath('/test');
-    final contextRoot = new ContextRoot(testPath, []);
+    final contextRoot =
+        new ContextRoot(resourceProvider.pathContext, testPath, []);
 
     dartDriver = new AnalysisDriver(
         new AnalysisDriverScheduler(logger)..start(),

old_plugin_loader/lib/starter.dart

diff --git a/old_plugin_loader/lib/starter.dart b/old_plugin_loader/lib/starter.dart
index 9c81103..b5fdce6 100644
--- a/old_plugin_loader/lib/starter.dart
+++ b/old_plugin_loader/lib/starter.dart
@@ -121,8 +121,6 @@
           ];
           final completionRequest = new CompletionRequestImpl(
             null, // AnalysisResult - unneeded for AngularCompletion
-            server.resourceProvider,
-            source,
             params.offset,
             performance,
           );