Fine. Move 'withFineDependencies' flag into instance fields.

Using global flag did not give me enough confidence anymore.

Change-Id: I079b2b05bd7c16f853512a9d023518fc380940a8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443145
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

pkg/analyzer/lib/dart/sdk/build_sdk_summary.dart

@@ -58,6 +58,7 @@ Future<Uint8List> buildSdkSummary({
     sourceFactory: SourceFactory([DartUriResolver(sdk)]),
     analysisOptionsMap: optionsMap,
     packages: Packages({}),
+    withFineDependencies: false,
   );
   scheduler.start();
 

pkg/analyzer/lib/src/clients/build_resolvers/build_resolvers.dart

@@ -73,6 +73,7 @@ AnalysisDriverForPackageBuild createAnalysisDriver({
     fileContentCache: fileContentCache,
     externalSummaries: dataStore,
     packages: packages,
+    withFineDependencies: false,
     shouldReportInconsistentAnalysisException: false,
   );
 

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

@@ -47,6 +47,7 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
     List<String>? librarySummaryPaths,
     String? optionsFile,
     String? packagesFile,
+    bool withFineDependencies = false,
     PerformanceLog? performanceLog,
     ResourceProvider? resourceProvider,
     bool retainDataForTesting = false,
@@ -92,7 +93,10 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
     );
 
     byteStore ??= MemoryByteStore();
-    var linkedBundleProvider = LinkedBundleProvider(byteStore: byteStore);
+    var linkedBundleProvider = LinkedBundleProvider(
+      byteStore: byteStore,
+      withFineDependencies: withFineDependencies,
+    );
 
     var contextBuilder = ContextBuilderImpl(
       resourceProvider: this.resourceProvider,
@@ -118,6 +122,7 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
         unlinkedUnitStore: unlinkedUnitStore ?? UnlinkedUnitStoreImpl(),
         ownedFiles: ownedFiles,
         enableLintRuleTiming: enableLintRuleTiming,
+        withFineDependencies: withFineDependencies,
       );
       contexts.add(context);
     }

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

@@ -90,10 +90,14 @@ class ContextBuilderImpl {
     OwnedFiles? ownedFiles,
     bool enableLintRuleTiming = false,
     LinkedBundleProvider? linkedBundleProvider,
+    required bool withFineDependencies,
   }) {
     byteStore ??= MemoryByteStore();
     performanceLog ??= PerformanceLog(null);
-    linkedBundleProvider ??= LinkedBundleProvider(byteStore: byteStore);
+    linkedBundleProvider ??= LinkedBundleProvider(
+      byteStore: byteStore,
+      withFineDependencies: withFineDependencies,
+    );
 
     if (scheduler == null) {
       scheduler = AnalysisDriverScheduler(performanceLog);
@@ -173,6 +177,7 @@ class ContextBuilderImpl {
       testView: retainDataForTesting ? AnalysisDriverTestView() : null,
       ownedFiles: ownedFiles,
       enableLintRuleTiming: enableLintRuleTiming,
+      withFineDependencies: withFineDependencies,
     );
 
     // AnalysisDriver reports results into streams.

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

@@ -150,6 +150,9 @@ class AnalysisDriver {
   /// The [Packages] object with packages and their language versions.
   final Packages _packages;
 
+  /// Whether fine-grained dependencies experiment is enabled.
+  final bool withFineDependencies;
+
   /// The [SourceFactory] is used to resolve URIs to paths and restore URIs
   /// from file paths.
   final SourceFactory _sourceFactory;
@@ -291,6 +294,7 @@ class AnalysisDriver {
     required ByteStore byteStore,
     required SourceFactory sourceFactory,
     required Packages packages,
+    required this.withFineDependencies,
     LinkedBundleProvider? linkedBundleProvider,
     this.ownedFiles,
     this.analysisContext,
@@ -315,7 +319,11 @@ class AnalysisDriver {
        _logger = logger,
        _packages = packages,
        linkedBundleProvider =
-           linkedBundleProvider ?? LinkedBundleProvider(byteStore: byteStore),
+           linkedBundleProvider ??
+           LinkedBundleProvider(
+             byteStore: byteStore,
+             withFineDependencies: withFineDependencies,
+           ),
        _sourceFactory = sourceFactory,
        _externalSummaries = externalSummaries,
        declaredVariables = declaredVariables ?? DeclaredVariables(),
@@ -405,6 +413,7 @@ class AnalysisDriver {
       externalSummaries: _externalSummaries,
       fileSystemState: _fsState,
       linkedBundleProvider: linkedBundleProvider,
+      withFineDependencies: withFineDependencies,
     );
   }
 
@@ -1623,6 +1632,7 @@ class AnalysisDriver {
       isGenerated: (_) => false,
       onNewFile: _onNewFile,
       testData: testView?.fileSystem,
+      withFineDependencies: withFineDependencies,
     );
     _fileTracker = FileTracker(_logger, _fsState, _fileContentStrategy);
   }

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

@@ -1194,6 +1194,7 @@ class FileSystemState {
   final SourceFactory _sourceFactory;
   final Workspace? _workspace;
   final DeclaredVariables _declaredVariables;
+  final bool withFineDependencies;
   final Uint32List _saltForUnlinked;
   final Uint32List _saltForElements;
 
@@ -1272,6 +1273,7 @@ class FileSystemState {
     required this.isGenerated,
     required this.onNewFile,
     required this.testData,
+    required this.withFineDependencies,
   }) : _analysisOptionsMap = analysisOptionsMap {
     _testView = FileSystemStateTestView(this);
   }
@@ -1886,7 +1888,11 @@ class LibraryFileKind extends LibraryOrAugmentationFileKind {
   /// just this file.  If the library cycle is not known yet, compute it.
   LibraryCycle get libraryCycle {
     if (_libraryCycle == null) {
-      computeLibraryCycle(file._fsState._saltForElements, this);
+      computeLibraryCycle(
+        file._fsState.withFineDependencies,
+        file._fsState._saltForElements,
+        this,
+      );
     }
 
     return _libraryCycle!;

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

@@ -46,6 +46,7 @@ class LibraryContext {
   final StreamController<Object>? eventsController;
   final FileSystemState fileSystemState;
   final File? packagesFile;
+  final bool withFineDependencies;
   final SummaryDataStore store = SummaryDataStore();
 
   late final AnalysisContextImpl analysisContext;
@@ -66,6 +67,7 @@ class LibraryContext {
     required DeclaredVariables declaredVariables,
     required SourceFactory sourceFactory,
     required this.packagesFile,
+    required this.withFineDependencies,
     required SummaryDataStore? externalSummaries,
   }) {
     testData?.instance = this;
@@ -448,7 +450,7 @@ class LinkedBundleEntry {
   ///
   /// These requirements are to the libraries in dependencies.
   ///
-  /// If [withFineDependencies] is `false`, the requirements are empty.
+  /// Without fine-grained dependencies, the requirements are empty.
   final RequirementsManifest requirements;
 
   /// The serialized libraries, for [BundleReader].
@@ -473,14 +475,18 @@ class LinkedBundleEntry {
 /// but this is relatively cheap.
 class LinkedBundleProvider {
   final ByteStore byteStore;
+  final bool withFineDependencies;
 
   /// The cache of deserialized bundles, used only when [withFineDependencies]
   /// to avoid reading requirements and manifests again and again.
   ///
   /// The keys are [LibraryCycle.linkedKey].
   final Map<String, LinkedBundleEntry> map = {};
 
-  LinkedBundleProvider({required this.byteStore});
+  LinkedBundleProvider({
+    required this.byteStore,
+    required this.withFineDependencies,
+  });
 
   LinkedBundleEntry? get(String key) {
     if (map[key] case var entry?) {

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

@@ -9,15 +9,18 @@ import 'package:_fe_analyzer_shared/src/util/dependency_walker.dart'
     show DependencyWalker, Node;
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
-import 'package:analyzer/src/fine/requirements.dart';
 import 'package:analyzer/src/summary/api_signature.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
 import 'package:collection/collection.dart';
 
 /// Ensure that the `FileState._libraryCycle` for the [file] and anything it
 /// depends on is computed.
-void computeLibraryCycle(Uint32List salt, LibraryFileKind file) {
-  var libraryWalker = _LibraryWalker(salt);
+void computeLibraryCycle(
+  bool withFineDependencies,
+  Uint32List salt,
+  LibraryFileKind file,
+) {
+  var libraryWalker = _LibraryWalker(withFineDependencies, salt);
   libraryWalker.walk(libraryWalker.getNode(file));
 }
 
@@ -26,6 +29,8 @@ class LibraryCycle {
   static int _nextId = 0;
   final int id = _nextId++;
 
+  final bool withFineDependencies;
+
   /// The libraries that belong to this cycle.
   final List<LibraryFileKind> libraries;
 
@@ -65,6 +70,7 @@ class LibraryCycle {
   final String nonTransitiveApiSignature;
 
   LibraryCycle({
+    required this.withFineDependencies,
     required this.libraries,
     required this.libraryUris,
     required this.directDependencies,
@@ -148,10 +154,11 @@ class _LibraryNode extends graph.Node<_LibraryNode> {
 /// Helper that organizes dependencies of a library into topologically
 /// sorted [LibraryCycle]s.
 class _LibraryWalker extends graph.DependencyWalker<_LibraryNode> {
+  final bool withFineDependencies;
   final Uint32List _salt;
   final Map<LibraryFileKind, _LibraryNode> nodesOfFiles = {};
 
-  _LibraryWalker(this._salt);
+  _LibraryWalker(this.withFineDependencies, this._salt);
 
   @override
   void evaluate(_LibraryNode v) {
@@ -220,6 +227,7 @@ class _LibraryWalker extends graph.DependencyWalker<_LibraryNode> {
 
     // Create the LibraryCycle instance for the cycle.
     var cycle = LibraryCycle(
+      withFineDependencies: withFineDependencies,
       libraries: libraries.toFixedList(),
       libraryUris: libraryUris,
       directDependencies: directDependencies,

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

@@ -5745,7 +5745,7 @@ class LibraryElementImpl extends ElementImpl
   /// The map of top-level declarations, from all units.
   LibraryDeclarations? _libraryDeclarations;
 
-  /// If [withFineDependencies] is `true`, the manifest of the library.
+  /// With fine-grained dependencies, the manifest of the library.
   LibraryManifest? manifest;
 
   /// Initialize a newly created library element in the given [context] to have

pkg/analyzer/lib/src/dart/micro/resolve_file.dart

@@ -334,9 +334,10 @@ class FileResolver {
       var bytes = _errorResultsCache.get(errorsKey);
       if (bytes != null) {
         var data = CiderUnitErrors.fromBuffer(bytes);
-        diagnostics = data.errors.map((error) {
-          return ErrorEncoding.decode(file.source, error)!;
-        }).toList();
+        diagnostics =
+            data.errors.map((error) {
+              return ErrorEncoding.decode(file.source, error)!;
+            }).toList();
       } else {
         var unitResult = await resolve(path: path, performance: performance);
         diagnostics = unitResult.diagnostics;
@@ -655,15 +656,16 @@ class FileResolver {
         });
       });
 
-      var resolvedUnits = results.map((fileResult) {
-        var file = fileResult.file;
-        return ResolvedUnitResultImpl(
-          session: contextObjects!.analysisSession,
-          fileState: file,
-          unit: fileResult.unit,
-          diagnostics: fileResult.diagnostics,
-        );
-      }).toList();
+      var resolvedUnits =
+          results.map((fileResult) {
+            var file = fileResult.file;
+            return ResolvedUnitResultImpl(
+              session: contextObjects!.analysisSession,
+              fileState: file,
+              unit: fileResult.unit,
+              diagnostics: fileResult.diagnostics,
+            );
+          }).toList();
 
       var libraryUnit = resolvedUnits.first;
       var result = ResolvedLibraryResultImpl(
@@ -696,12 +698,13 @@ class FileResolver {
       return;
     }
 
-    var analysisOptions = (AnalysisOptionsBuilder()
-          ..strictInference = fileAnalysisOptions.strictInference
-          ..contextFeatures =
-              FeatureSet.latestLanguageVersion() as ExperimentStatus
-          ..nonPackageFeatureSet = FeatureSet.latestLanguageVersion())
-        .build();
+    var analysisOptions =
+        (AnalysisOptionsBuilder()
+              ..strictInference = fileAnalysisOptions.strictInference
+              ..contextFeatures =
+                  FeatureSet.latestLanguageVersion() as ExperimentStatus
+              ..nonPackageFeatureSet = FeatureSet.latestLanguageVersion())
+            .build();
 
     if (fsState == null) {
       var featureSetProvider = FeatureSetProvider.build(
@@ -730,6 +733,7 @@ class FileResolver {
         onNewFile: (file) {},
         testData: testData?.fileSystem,
         unlinkedUnitStore: UnlinkedUnitStoreImpl(),
+        withFineDependencies: false,
       );
     }
 
@@ -759,8 +763,12 @@ class FileResolver {
         sourceFactory: sourceFactory,
         externalSummaries: SummaryDataStore(),
         packagesFile: null,
+        withFineDependencies: false,
         testData: testData?.libraryContext,
-        linkedBundleProvider: LinkedBundleProvider(byteStore: byteStore),
+        linkedBundleProvider: LinkedBundleProvider(
+          byteStore: byteStore,
+          withFineDependencies: false,
+        ),
       );
 
       contextObjects!.analysisSession.elementFactory =
@@ -783,8 +791,8 @@ class FileResolver {
     YamlMap? optionMap;
 
     var separator = resourceProvider.pathContext.separator;
-    var isThirdParty = path
-            .contains('${separator}third_party${separator}dart$separator') ||
+    var isThirdParty =
+        path.contains('${separator}third_party${separator}dart$separator') ||
         path.contains('${separator}third_party${separator}dart_lang$separator');
 
     File? optionsFile;
@@ -882,15 +890,16 @@ class FileResolver {
       );
       unitResult.unit.accept(visitor);
       var lineInfo = unitResult.lineInfo;
-      var infos = visitor.results
-          .map(
-            (searchResult) => CiderSearchInfo(
-              lineInfo.getLocation(searchResult.offset),
-              searchResult.length,
-              MatchKind.REFERENCE,
-            ),
-          )
-          .toList();
+      var infos =
+          visitor.results
+              .map(
+                (searchResult) => CiderSearchInfo(
+                  lineInfo.getLocation(searchResult.offset),
+                  searchResult.length,
+                  MatchKind.REFERENCE,
+                ),
+              )
+              .toList();
       results.add(CiderSearchMatch(unitPath, infos));
     }
     return results;