Avoid context confusion in ServerPlugin.analyzeFiles

Change-Id: Ib2500c17e4abe2a485fb8325134276f803113db4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/388701
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: jonasfj

pkg/analyzer_plugin/lib/plugin/plugin.dart

@@ -107,11 +107,12 @@ abstract class ServerPlugin {
 
     // First analyze priority files.
     for (var path in priorityPaths) {
-      pathSet.remove(path);
-      await analyzeFile(
-        analysisContext: analysisContext,
-        path: path,
-      );
+      if (pathSet.remove(path)) {
+        await analyzeFile(
+          analysisContext: analysisContext,
+          path: path,
+        );
+      }
     }
 
     // Then analyze the remaining files.

pkg/analyzer_plugin/test/plugin/plugin_test.dart

@@ -401,6 +401,30 @@ void main(List<String> args, SendPort sendPort) {
     expect(removeResult, isNotNull);
   }
 
+  Future<void> test_onRequest_analyzeFileIsNotContextConfused() async {
+    var plugin = this.plugin as _TestServerPlugin;
+    var confusedPaths = <String>[];
+    plugin.analyzeFileHandler = ({
+      required AnalysisContext analysisContext,
+      required String path,
+    }) {
+      // Test that path actually belongs to analysisContext
+      if (!analysisContext.contextRoot.isAnalyzed(path)) {
+        confusedPaths.add(
+          '$path analyzed in context for'
+          ' ${analysisContext.contextRoot.root.path}',
+        );
+      }
+    };
+
+    var result = await channel
+        .sendRequest(AnalysisSetPriorityFilesParams([filePath1, filePath2]));
+    expect(result, isNotNull);
+    await channel.sendRequest(
+        AnalysisSetContextRootsParams([contextRoot1, contextRoot2]));
+    expect(confusedPaths, []);
+  }
+
   Future<void> test_onRequest_completionGetSuggestions() async {
     await channel.sendRequest(AnalysisSetContextRootsParams([contextRoot1]));