start using getAnalysisOptionsForFile

Baby steps w/ context locator. Some TODOs show how this will thread through the driver into the library analyzer.

Change-Id: I95f3047929c2bea6e7d5c1c9dc217c40ca9e4eef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/333302
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>

Author: pq

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

@@ -185,19 +185,15 @@ class ContextBuilderImpl2 implements ContextBuilder {
     var map = AnalysisOptionsMap();
     var provider = AnalysisOptionsProvider(sourceFactory);
     var pubspecFile = _findPubspecFile(contextRoot);
-    for (var entry in (contextRoot as ContextRootImpl).optionsFileMap.entries) {
-      var options = AnalysisOptionsImpl();
-      var optionsYaml = provider.getOptionsFromFile(entry.value);
-      options.applyOptions(optionsYaml);
 
+    void updateOptions(AnalysisOptionsImpl options) {
       if (pubspecFile != null) {
         var extractor = SdkConstraintExtractor(pubspecFile);
         var sdkVersionConstraint = extractor.constraint();
         if (sdkVersionConstraint != null) {
           options.sdkVersionConstraint = sdkVersionConstraint;
         }
       }
-
       if (updateAnalysisOptions != null) {
         updateAnalysisOptions(options);
       } else if (updateAnalysisOptions2 != null) {
@@ -207,8 +203,25 @@ class ContextBuilderImpl2 implements ContextBuilder {
           sdk: sdk,
         );
       }
+    }
+
+    var optionsMappings =
+        (contextRoot as ContextRootImpl).optionsFileMap.entries;
 
-      map.add(entry.key, options);
+    // If there are no options files, we still want to propagate sdk constraints
+    // and options updates to the context root.
+    if (optionsMappings.isEmpty) {
+      var options = AnalysisOptionsImpl();
+      updateOptions(options);
+      map.add(contextRoot.root, options);
+    } else {
+      for (var entry in optionsMappings) {
+        var options = AnalysisOptionsImpl();
+        var optionsYaml = provider.getOptionsFromFile(entry.value);
+        options.applyOptions(optionsYaml);
+        updateOptions(options);
+        map.add(entry.key, options);
+      }
     }
 
     return map;

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

@@ -669,8 +669,8 @@ class AnalysisDriver implements AnalysisDriverGeneric {
   }
 
   @experimental
-  AnalysisOptions? getAnalysisOptionsForFile(File file) =>
-      _analysisOptionsMap?.getOptions(file);
+  AnalysisOptions getAnalysisOptionsForFile(File file) =>
+      _analysisOptionsMap?.getOptions(file) ?? AnalysisOptionsImpl();
 
   /// Return the cached [ResolvedUnitResult] for the Dart file with the given
   /// [path]. If there is no cached result, return `null`. Usually only results
@@ -1370,6 +1370,9 @@ class AnalysisDriver implements AnalysisDriverGeneric {
           performance: OperationPerformanceImpl('<root>'),
         );
 
+        // todo(pq): pass this into the library analyzer.
+        //var options = libraryContext.analysisContext.getAnalysisOptionsForFile(file.resource);
+
         var results = LibraryAnalyzer(
           analysisOptions as AnalysisOptionsImpl,
           declaredVariables,
@@ -1480,6 +1483,9 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         performance: OperationPerformanceImpl('<root>'),
       );
 
+      // todo(pq): pass this into the library analyzer.
+      //var options = libraryContext.analysisContext.getAnalysisOptionsForFile(library.file.resource);
+
       var unitResults = LibraryAnalyzer(
               analysisOptions as AnalysisOptionsImpl,
               declaredVariables,
@@ -1940,6 +1946,9 @@ class AnalysisDriver implements AnalysisDriverGeneric {
       );
       var unitElement = libraryContext.computeUnitElement(library, file);
 
+      // todo(pq): pass this into the library analyzer.
+      //var options = libraryContext.analysisContext.getAnalysisOptionsForFile(file.resource);
+
       var analysisResult = LibraryAnalyzer(
         analysisOptions as AnalysisOptionsImpl,
         declaredVariables,

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

@@ -58,6 +58,6 @@ class DriverBasedAnalysisContext implements AnalysisContext {
   }
 
   @experimental
-  AnalysisOptions? getAnalysisOptionsForFile(File file) =>
+  AnalysisOptions getAnalysisOptionsForFile(File file) =>
       driver.getAnalysisOptionsForFile(file);
 }

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

@@ -8,9 +8,8 @@ import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/context/packages.dart';
 import 'package:analyzer/src/context/source.dart';
-import 'package:analyzer/src/dart/analysis/context_builder.dart';
 import 'package:analyzer/src/dart/analysis/context_builder2.dart';
-import 'package:analyzer/src/dart/analysis/context_locator.dart';
+import 'package:analyzer/src/dart/analysis/context_locator2.dart';
 import 'package:analyzer/src/dart/analysis/context_root.dart';
 import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
@@ -29,12 +28,12 @@ import '../resolution/context_collection_resolution.dart';
 
 main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(ContextBuilderImplTest);
+    defineReflectiveTests(ContextBuilderImplTest2);
   });
 }
 
 @reflectiveTest
-class ContextBuilderImplTest with ResourceProviderMixin {
+class ContextBuilderImplTest2 with ResourceProviderMixin {
   late final ContextBuilderImpl2 contextBuilder;
   late final ContextRoot contextRoot;
 
@@ -64,24 +63,26 @@ class ContextBuilderImplTest with ResourceProviderMixin {
 
   void test_analysisOptions_invalid() {
     var projectPath = convertPath('/home/test');
-    newAnalysisOptionsYamlFile(projectPath, ';');
+    var optionsFile = newAnalysisOptionsYamlFile(projectPath, ';');
 
     var analysisContext = _createSingleAnalysisContext(projectPath);
-    var analysisOptions = analysisContext.analysisOptionsImpl;
+    var analysisOptions =
+        analysisContext.getAnalysisOptionsImplForFile(optionsFile);
     _expectEqualOptions(analysisOptions, AnalysisOptionsImpl());
   }
 
   void test_analysisOptions_languageOptions() {
     var projectPath = convertPath('/home/test');
-    newAnalysisOptionsYamlFile(
+    var optionsFile = newAnalysisOptionsYamlFile(
       projectPath,
       AnalysisOptionsFileConfig(
         strictRawTypes: true,
       ).toContent(),
     );
 
     var analysisContext = _createSingleAnalysisContext(projectPath);
-    var analysisOptions = analysisContext.analysisOptionsImpl;
+    var analysisOptions =
+        analysisContext.getAnalysisOptionsImplForFile(optionsFile);
     _expectEqualOptions(
       analysisOptions,
       AnalysisOptionsImpl()..strictRawTypes = true,
@@ -90,22 +91,23 @@ class ContextBuilderImplTest with ResourceProviderMixin {
 
   void test_analysisOptions_sdkVersionConstraint_hasPubspec_hasSdk() {
     var projectPath = convertPath('/home/test');
-    newPubspecYamlFile(projectPath, '''
+    var pubspec = newPubspecYamlFile(projectPath, '''
 environment:
   sdk: ^2.1.0
 ''');
 
     var analysisContext = _createSingleAnalysisContext(projectPath);
-    var analysisOptions = analysisContext.analysisOptionsImpl;
+    var analysisOptions =
+        analysisContext.getAnalysisOptionsImplForFile(pubspec);
     expect(analysisOptions.sdkVersionConstraint.toString(), '^2.1.0');
   }
 
   void test_analysisOptions_sdkVersionConstraint_noPubspec() {
     var projectPath = convertPath('/home/test');
-    newFile('$projectPath/lib/a.dart', '');
+    var file = newFile('$projectPath/lib/a.dart', '');
 
     var analysisContext = _createSingleAnalysisContext(projectPath);
-    var analysisOptions = analysisContext.driver.analysisOptions;
+    var analysisOptions = analysisContext.getAnalysisOptionsForFile(file);
     expect(analysisOptions.sdkVersionConstraint, isNull);
   }
 
@@ -207,11 +209,11 @@ environment:
 
   /// Return a single expected analysis context at the [path].
   DriverBasedAnalysisContext _createSingleAnalysisContext(String path) {
-    var roots = ContextLocatorImpl(
+    var roots = ContextLocatorImpl2(
       resourceProvider: resourceProvider,
     ).locateRoots(includedPaths: [path]);
 
-    return ContextBuilderImpl(
+    return ContextBuilderImpl2(
       resourceProvider: resourceProvider,
     ).createContext(
       contextRoot: roots.single,
@@ -239,11 +241,10 @@ environment:
 }
 
 extension on DriverBasedAnalysisContext {
-  AnalysisOptionsImpl get analysisOptionsImpl {
-    return driver.analysisOptions as AnalysisOptionsImpl;
-  }
-
   List<UriResolver> get uriResolvers {
     return (driver.sourceFactory as SourceFactoryImpl).resolvers;
   }
+
+  AnalysisOptionsImpl getAnalysisOptionsImplForFile(File file) =>
+      getAnalysisOptionsForFile(file) as AnalysisOptionsImpl;
 }