[DAS] Optimizes library resolution for bulk_fix_processor

Bug: #60472
Change-Id: Ia26b47f94e0851ae5da6e52fde3f9a2c4a3a0d20
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420600
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

@@ -514,20 +514,13 @@ class BulkFixProcessor {
           continue;
         }
 
-        var resolvedLibrary = await context.currentSession.getResolvedLibrary(
-          path,
-        );
+        var resolvedLibrary = await context.currentSession
+            .getResolvedLibraryContaining(path);
 
         if (isCancelled) {
           break;
         }
-        if (resolvedLibrary is NotLibraryButPartResult) {
-          var resolvedUnit = await context.currentSession.getResolvedUnit(path);
-          if (resolvedUnit is ResolvedUnitResult) {
-            resolvedLibrary = await context.currentSession
-                .getResolvedLibraryByElement2(resolvedUnit.libraryElement2);
-          }
-        }
+
         if (resolvedLibrary is ResolvedLibraryResult) {
           await _fixErrorsInLibraryAt(
             resolvedLibrary,

pkg/analyzer/api.txt

@@ -237,7 +237,7 @@ package:analyzer/dart/analysis/results.dart:
   UnitElementResult (class extends Object implements SomeUnitElementResult, FileResult):
     new (constructor: UnitElementResult Function())
     fragment (getter: LibraryFragment, experimental)
-  UnspecifiedInvalidResult (class extends Object implements InvalidResult, SomeLibraryElementResult, SomeParsedLibraryResult):
+  UnspecifiedInvalidResult (class extends Object implements InvalidResult, SomeErrorsResult, SomeFileResult, SomeLibraryElementResult, SomeParsedLibraryResult, SomeParsedUnitResult, SomeResolvedLibraryResult, SomeResolvedUnitResult, SomeUnitElementResult):
     new (constructor: UnspecifiedInvalidResult Function())
   UriOfExternalLibraryResult (class extends Object implements InvalidResult, SomeParsedLibraryResult, SomeResolvedLibraryResult):
     new (constructor: UriOfExternalLibraryResult Function())
@@ -256,6 +256,7 @@ package:analyzer/dart/analysis/session.dart:
     getParsedUnit (method: SomeParsedUnitResult Function(String))
     getResolvedLibrary (method: Future<SomeResolvedLibraryResult> Function(String))
     getResolvedLibraryByElement2 (method: Future<SomeResolvedLibraryResult> Function(LibraryElement2), experimental)
+    getResolvedLibraryContaining (method: Future<SomeResolvedLibraryResult> Function(String))
     getResolvedUnit (method: Future<SomeResolvedUnitResult> Function(String))
     getUnitElement (method: Future<SomeUnitElementResult> Function(String))
   InconsistentAnalysisException (class extends AnalysisException):

pkg/analyzer/lib/dart/analysis/results.dart

@@ -393,8 +393,14 @@ abstract class UnitElementResult implements SomeUnitElementResult, FileResult {
 class UnspecifiedInvalidResult
     implements
         InvalidResult,
+        SomeErrorsResult,
+        SomeFileResult,
         SomeLibraryElementResult,
-        SomeParsedLibraryResult {}
+        SomeParsedLibraryResult,
+        SomeParsedUnitResult,
+        SomeResolvedLibraryResult,
+        SomeResolvedUnitResult,
+        SomeUnitElementResult {}
 
 /// The type of [InvalidResult] returned when the given URI corresponds to
 /// a library that is served from an external summary bundle.

pkg/analyzer/lib/dart/analysis/session.dart

@@ -72,6 +72,14 @@ abstract class AnalysisSession {
   Future<SomeResolvedLibraryResult> getResolvedLibraryByElement2(
       LibraryElement2 element);
 
+  /// Return a future that will complete with information about the results of
+  /// resolving all of the files in the library containing the given absolute,
+  /// normalized [path].
+  ///
+  /// Similar to [getResolvedLibrary] but [path] can also be a part file of a
+  /// library.
+  Future<SomeResolvedLibraryResult> getResolvedLibraryContaining(String path);
+
   /// Return a future that will complete with information about the results of
   /// resolving the file with the given absolute, normalized [path].
   Future<SomeResolvedUnitResult> getResolvedUnit(String path);

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

@@ -128,6 +128,21 @@ class AnalysisSessionImpl implements AnalysisSession {
     return await _driver.getResolvedLibraryByUri(element.uri);
   }
 
+  @override
+  Future<SomeResolvedLibraryResult> getResolvedLibraryContaining(
+    String path,
+  ) async {
+    checkConsistency();
+    var libraryFragmentResult = await getUnitElement(path);
+    return switch (libraryFragmentResult) {
+      UnitElementResult(:var fragment) => await getResolvedLibraryByElement2(
+          fragment.element,
+        ),
+      SomeResolvedLibraryResult result => result,
+      _ => UnspecifiedInvalidResult(),
+    };
+  }
+
   @override
   Future<SomeResolvedUnitResult> getResolvedUnit(String path) async {
     checkConsistency();

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

@@ -116,12 +116,7 @@ class AnalysisSessionHelper {
   Future<ResolvedLibraryResult?> _getResolvedLibrary(String path) async {
     var result = _resolvedLibraries[path];
     if (result == null) {
-      var unit = await session.getUnitElement(path);
-      if (unit is! UnitElementResult) {
-        return null;
-      }
-      var some =
-          await session.getResolvedLibraryByElement2(unit.fragment.element);
+      var some = await session.getResolvedLibraryContaining(path);
       if (some is ResolvedLibraryResult) {
         result = _resolvedLibraries[path] = some;
       }

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

@@ -329,7 +329,8 @@ class B {}
     var parsedLibrary = session.getParsedLibraryValid(testFile);
 
     var element = libraryResult.element2.getClass2('A')!;
-    var declaration = parsedLibrary.getFragmentDeclaration(element.firstFragment)!;
+    var declaration =
+        parsedLibrary.getFragmentDeclaration(element.firstFragment)!;
     var node = declaration.node as ClassDeclaration;
     expect(node.name.lexeme, 'A');
     expect(node.offset, 0);
@@ -582,14 +583,16 @@ class B2 extends X {}
     expect(bUnitResult.unit.declarations, hasLength(2));
     expect(bUnitResult.errors, isNotEmpty);
 
-    var aDeclaration = resolvedLibrary.getFragmentDeclaration(aClass.firstFragment)!;
+    var aDeclaration =
+        resolvedLibrary.getFragmentDeclaration(aClass.firstFragment)!;
     var aNode = aDeclaration.node as ClassDeclaration;
     expect(aNode.name.lexeme, 'A');
     expect(aNode.offset, 16);
     expect(aNode.length, 16);
     expect(aNode.declaredFragment!.name2, 'A');
 
-    var bDeclaration = resolvedLibrary.getFragmentDeclaration(bClass.firstFragment)!;
+    var bDeclaration =
+        resolvedLibrary.getFragmentDeclaration(bClass.firstFragment)!;
     var bNode = bDeclaration.node as ClassDeclaration;
     expect(bNode.name.lexeme, 'B');
     expect(bNode.offset, 19);
@@ -708,6 +711,50 @@ part 'c.dart';
     expect(result, isA<NotElementOfThisSessionResult>());
   }
 
+  test_getResolvedLibraryContaining_library() async {
+    var a = newFile('$testPackageLibPath/a.dart', '');
+    var currentSession = contextFor(a).currentSession;
+    var filePath = a.toUri().toFilePath();
+    var result = await currentSession.getResolvedLibraryContaining(filePath);
+    var units = (result as ResolvedLibraryResult).units;
+    var paths = units.map((unit) => unit.path);
+    expect(paths, unorderedEquals([a.path]));
+  }
+
+  test_getResolvedLibraryContaining_part() async {
+    var lib = newFile('$testPackageLibPath/lib.dart', r'''
+part 'part.dart';
+''');
+    var part = newFile('$testPackageLibPath/part.dart', r'''
+part of 'lib.dart';
+''');
+    var currentSession = contextFor(part).currentSession;
+    var filePath = part.toUri().toFilePath();
+    var result = await currentSession.getResolvedLibraryContaining(filePath);
+    var units = (result as ResolvedLibraryResult).units;
+    var paths = units.map((unit) => unit.path);
+    expect(paths, unorderedEquals([lib.path, part.path]));
+  }
+
+  test_getResolvedLibraryContaining_part_part() async {
+    var lib = newFile('$testPackageLibPath/lib.dart', r'''
+part 'part.dart';
+''');
+    var part = newFile('$testPackageLibPath/part.dart', r'''
+part of 'lib.dart';
+part 'part_part.dart';
+''');
+    var partPart = newFile('$testPackageLibPath/part_part.dart', r'''
+part of 'part.dart';
+''');
+    var currentSession = contextFor(partPart).currentSession;
+    var filePath = partPart.toUri().toFilePath();
+    var result = await currentSession.getResolvedLibraryContaining(filePath);
+    var units = (result as ResolvedLibraryResult).units;
+    var paths = units.map((unit) => unit.path);
+    expect(paths, unorderedEquals([lib.path, part.path, partPart.path]));
+  }
+
   test_getResolvedUnit() async {
     var test = newFile(testFile.path, r'''
 class A {}
@@ -907,7 +954,8 @@ unitElementResult
         var element = result.fragment as CompilationUnitElementImpl;
         sink.writelnWithIndent('reference: ${element.reference}');
 
-        var library = (element as LibraryFragment).element as LibraryElementImpl;
+        var library =
+            (element as LibraryFragment).element as LibraryElementImpl;
         sink.writelnWithIndent('library: ${library.reference}');
 
         var classListStr = element.classes2.map((e) => e.name2).join(', ');