Use SearchedFiles when searching subtypes for 'analysis.implemented'.

[email protected]

Change-Id: I7bba90bd550602588553382fe61c8c41539483ca
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/113951
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/search/search_engine_internal.dart

@@ -23,6 +23,7 @@ class SearchEngineImpl implements SearchEngine {
     // TODO(brianwilkerson) Determine whether this await is necessary.
     await null;
     List<AnalysisDriver> drivers = _drivers.toList();
+    SearchedFiles searchedFiles = _createSearchedFiles(drivers);
 
     String libraryUriStr = type.librarySource.uri.toString();
     bool hasSubtypes = false;
@@ -36,8 +37,8 @@ class SearchEngineImpl implements SearchEngine {
         return;
       }
       for (AnalysisDriver driver in drivers) {
-        List<SubtypeResult> subtypes =
-            await driver.search.subtypes(type: type, subtype: subtype);
+        List<SubtypeResult> subtypes = await driver.search
+            .subtypes(searchedFiles, type: type, subtype: subtype);
         for (SubtypeResult subtype in subtypes) {
           hasSubtypes = true;
           members.addAll(subtype.libraryUri == libraryUriStr

pkg/analyzer/lib/src/dart/analysis/search.dart

@@ -141,7 +141,7 @@ class Search {
   /**
    * Return direct [SubtypeResult]s for either the [type] or [subtype].
    */
-  Future<List<SubtypeResult>> subtypes(
+  Future<List<SubtypeResult>> subtypes(SearchedFiles searchedFiles,
       {ClassElement type, SubtypeResult subtype}) async {
     String name;
     String id;
@@ -162,10 +162,12 @@ class Search {
 
     if (files != null) {
       for (FileState file in files) {
-        AnalysisDriverUnitIndex index = await _driver.getIndex(file.path);
-        if (index != null) {
-          var request = new _IndexRequest(index);
-          request.addSubtypes(id, results, file);
+        if (searchedFiles.add(file.path, this)) {
+          AnalysisDriverUnitIndex index = await _driver.getIndex(file.path);
+          if (index != null) {
+            var request = new _IndexRequest(index);
+            request.addSubtypes(id, results, file);
+          }
         }
       }
     }

pkg/analyzer/test/src/dart/analysis/search_test.dart

@@ -1320,7 +1320,8 @@ class F {}
     ClassElement a = _findElement('A');
 
     // Search by 'type'.
-    List<SubtypeResult> subtypes = await driver.search.subtypes(type: a);
+    List<SubtypeResult> subtypes =
+        await driver.search.subtypes(SearchedFiles(), type: a);
     expect(subtypes, hasLength(3));
 
     SubtypeResult b = subtypes.singleWhere((r) => r.name == 'B');
@@ -1341,7 +1342,8 @@ class F {}
 
     // Search by 'id'.
     {
-      List<SubtypeResult> subtypes = await driver.search.subtypes(subtype: b);
+      List<SubtypeResult> subtypes =
+          await driver.search.subtypes(SearchedFiles(), subtype: b);
       expect(subtypes, hasLength(1));
       SubtypeResult e = subtypes.singleWhere((r) => r.name == 'E');
       expect(e.members, ['methodE']);
@@ -1390,7 +1392,8 @@ class A {
     ClassElement aClass = aLibrary.getType('A');
 
     // Search by 'type'.
-    List<SubtypeResult> subtypes = await driver.search.subtypes(type: aClass);
+    List<SubtypeResult> subtypes =
+        await driver.search.subtypes(SearchedFiles(), type: aClass);
     expect(subtypes, hasLength(3));
 
     SubtypeResult t1 = subtypes.singleWhere((r) => r.name == 'T1');
@@ -1465,7 +1468,8 @@ class A {}
     driver.addFile(pathC);
     await scheduler.waitForIdle();
 
-    List<SubtypeResult> subtypes = await driver.search.subtypes(type: a);
+    List<SubtypeResult> subtypes =
+        await driver.search.subtypes(SearchedFiles(), type: a);
     expect(subtypes, hasLength(2));
 
     SubtypeResult b = subtypes.singleWhere((r) => r.name == 'B');
@@ -1494,7 +1498,7 @@ mixin M on A, B {
     ClassElement b = _findElement('B');
 
     {
-      var subtypes = await driver.search.subtypes(type: a);
+      var subtypes = await driver.search.subtypes(SearchedFiles(), type: a);
       expect(subtypes, hasLength(1));
 
       var m = subtypes.singleWhere((r) => r.name == 'M');
@@ -1504,7 +1508,7 @@ mixin M on A, B {
     }
 
     {
-      var subtypes = await driver.search.subtypes(type: b);
+      var subtypes = await driver.search.subtypes(SearchedFiles(), type: b);
       expect(subtypes, hasLength(1));
 
       var m = subtypes.singleWhere((r) => r.name == 'M');
@@ -1523,7 +1527,8 @@ class B extends A {}
 ''');
     ClassElement a = _findElement('A');
 
-    List<SubtypeResult> subtypes = await driver.search.subtypes(type: a);
+    List<SubtypeResult> subtypes =
+        await driver.search.subtypes(SearchedFiles(), type: a);
     expect(subtypes, hasLength(1));
 
     SubtypeResult b = subtypes.singleWhere((r) => r.name == 'B');