analyzer: rename docImports to docLibraryImports in a few places

This restores parts of commit 292987f,
theoretically no-op parts, to make the perf investigation and re-land
simpler.

Change-Id: Ib394cb56e1aec7644766b255d819db9c0910d5bb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403391
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Samuel Rawlins <srawlins@google.com>

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

@@ -1374,7 +1374,7 @@ class AnalysisDriver {
           },
         );
 
-        for (var import in library.docImports) {
+        for (var import in library.docLibraryImports) {
           if (import is LibraryImportWithFile) {
             if (import.importedLibrary case var libraryFileKind?) {
               await libraryContext.load(

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

@@ -204,7 +204,7 @@ abstract class FileKind {
   List<LibraryExportState>? _libraryExports;
   List<LibraryImportState>? _libraryImports;
   List<PartIncludeState>? _partIncludes;
-  List<LibraryImportState>? _docImports;
+  List<LibraryImportState>? _docLibraryImports;
 
   FileKind({
     required this.file,
@@ -222,13 +222,10 @@ abstract class FileKind {
     );
   }
 
-  /// The import states of each `@docImport` on the library directive.
-  List<LibraryImportState> get docImports {
-    if (_docImports case var existing?) {
-      return existing;
-    }
-
-    return _docImports =
+  /// The import states of each `@docImport` on the library directive or
+  /// part-of directive.
+  List<LibraryImportState> get docLibraryImports {
+    return _docLibraryImports ??=
         _unlinkedDocImports.map(_buildLibraryImportState).toFixedList();
   }
 
@@ -382,7 +379,7 @@ abstract class FileKind {
     libraryExports;
     libraryImports;
     partIncludes;
-    docImports;
+    docLibraryImports;
   }
 
   @mustCallSuper
@@ -392,7 +389,7 @@ abstract class FileKind {
     _libraryExports?.disposeAll();
     _libraryImports?.disposeAll();
     _partIncludes?.disposeAll();
-    _docImports?.disposeAll();
+    _docLibraryImports?.disposeAll();
   }
 
   /// Dispose the containing [LibraryFileKind] cycle.

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

@@ -820,7 +820,7 @@ class LibraryAnalyzer {
       for (var i = 0; i < docImports.length; i++) {
         _resolveLibraryDocImportDirective(
           directive: docImports[i].import as ImportDirectiveImpl,
-          state: fileKind.docImports[i],
+          state: fileKind.docLibraryImports[i],
           errorReporter: containerErrorReporter,
         );
       }
@@ -855,7 +855,7 @@ class LibraryAnalyzer {
         fileAnalysis.file.uri, inferenceDataForTesting!);
 
     var docImportLibraries = [
-      for (var import in _library.docImports)
+      for (var import in _library.docLibraryImports)
         if (import is LibraryImportWithFile)
           _libraryElement.session.elementFactory
               .libraryOfUri2(import.importedFile.uri)

pkg/analyzer/lib/src/dart/element/scope.dart

@@ -27,18 +27,19 @@ class ConstructorInitializerScope extends EnclosedScope {
   }
 }
 
-/// The scope that looks up elements in doc imports.
+/// The scope that looks up elements in documentation comments.
 ///
 /// Attempts to look up elements in its [innerScope] before searching
-/// through the doc imports.
-class DocImportScope with _GettersAndSetters implements Scope {
+/// through any doc imports.
+class DocumentationCommentScope with _GettersAndSetters implements Scope {
   /// The scope that will be prioritized in look ups before searching in doc
   /// imports.
   ///
   /// Will be set for each specific comment scope in the `ScopeResolverVisitor`.
   Scope innerScope;
 
-  DocImportScope(this.innerScope, List<LibraryElement> docImportLibraries) {
+  DocumentationCommentScope(
+      this.innerScope, List<LibraryElement> docImportLibraries) {
     for (var importedLibrary in docImportLibraries) {
       if (importedLibrary is LibraryElementImpl) {
         // TODO(kallentu): Handle combinators.

pkg/analyzer/lib/src/generated/resolver.dart

@@ -4524,7 +4524,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
   Scope nameScope;
 
   /// The scope of libraries imported by `@docImport`s.
-  final DocImportScope _docImportScope;
+  final DocumentationCommentScope _docImportScope;
 
   /// The scope used to resolve unlabeled `break` and `continue` statements.
   ImplicitLabelScope _implicitLabelScope = ImplicitLabelScope.ROOT;
@@ -4551,7 +4551,8 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
     this.errorReporter, {
     required this.nameScope,
     List<LibraryElement> docImportLibraries = const [],
-  }) : _docImportScope = DocImportScope(nameScope, docImportLibraries);
+  }) : _docImportScope =
+            DocumentationCommentScope(nameScope, docImportLibraries);
 
   /// Return the implicit label scope in which the current node is being
   /// resolved.
@@ -5409,7 +5410,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
     }
   }
 
-  /// Visits a documentation comment with a [DocImportScope] that encloses the
+  /// Visits a documentation comment with a [DocumentationCommentScope] that encloses the
   /// current [nameScope].
   void _visitDocumentationComment(CommentImpl? node) {
     if (node == null) return;

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

@@ -118,8 +118,8 @@ class AnalyzerStatePrinter {
 
   void _writeDocImports(FileKind container) {
     _writeElements<LibraryImportState>(
-      'docImports',
-      container.docImports,
+      'docLibraryImports',
+      container.docLibraryImports,
       (import) {
         expect(import.isDocImport, isTrue);
         _writeLibraryImport(container, import);

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

@@ -1127,7 +1127,7 @@ files
       kind: library_0
         libraryImports
           library_1 dart:core synthetic
-        docImports
+        docLibraryImports
           library_3 dart:async
           library_5 dart:math
         fileKinds: library_0
@@ -4256,7 +4256,7 @@ files
       kind: partOfUriKnown_1
         uriFile: file_0
         library: library_0
-        docImports
+        docLibraryImports
           library_4 dart:async
           library_6 dart:math
       referencingFiles: file_0
@@ -4297,7 +4297,7 @@ files
       kind: partOfUriKnown_7
         uriFile: file_0
         library: library_0
-        docImports
+        docLibraryImports
           library_4 dart:async
       referencingFiles: file_0
       unlinkedKey: k02
@@ -5111,7 +5111,7 @@ class C {}
 
     fileStateFor(a);
 
-    // `c.dart` is imported by `b.dart`, so it is a dependency of `c.dart`.
+    // `c.dart` is imported by `b.dart`, so it is a dependency of `a.dart`.
     assertDriverStateString(testFile, r'''
 files
   /home/test/lib/a.dart