Remove deprecated AnalysisContext.analysisOptions

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

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -4,6 +4,7 @@
 * Remove deprecated `RecordType.positionalTypes`.
 * Remove deprecated `RecordType.sortedNamedTypes`.
 * Remove `ElementLocation` class; its values are not returned anymore.
+* Remove deprecated `AnalysisContext.analysisOptions`.
 * Deprecate `element2.dart` library; import `element.dart`.
 * Deprecate `XyzElement2` classes; use `XyzElement` instead.
 * Deprecate `AnalysisError.correction` field; use

pkg/analyzer/api.txt

@@ -1,7 +1,6 @@
 package:analyzer/dart/analysis/analysis_context.dart:
   AnalysisContext@1 (class extends Object):
     new (constructor: AnalysisContext@1 Function())
-    analysisOptions (getter: AnalysisOptions, deprecated)
     contextRoot (getter: ContextRoot)
     currentSession (getter: AnalysisSession)
     sdkRoot (getter: Folder?)
@@ -4803,7 +4802,6 @@ package:analyzer/src/dart/resolver/scope.dart:
 package:analyzer/src/generated/engine.dart:
   AnalysisContext@2 (class extends Object):
     new (constructor: AnalysisContext@2 Function())
-    analysisOptions (getter: AnalysisOptions, deprecated)
     declaredVariables (getter: DeclaredVariables)
     sourceFactory (getter: SourceFactory)
     getAnalysisOptionsForFile (method: AnalysisOptions Function(File), experimental)

pkg/analyzer/lib/dart/analysis/analysis_context.dart

@@ -19,10 +19,6 @@ import 'package:meta/meta.dart';
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class AnalysisContext {
-  /// The analysis options used to control the way the code is analyzed.
-  @Deprecated("Use 'getAnalysisOptionsForFile(file)' instead")
-  AnalysisOptions get analysisOptions;
-
   /// Return the context root from which this context was created.
   ContextRoot get contextRoot;
 

pkg/analyzer/lib/src/context/context.dart

@@ -31,12 +31,6 @@ class AnalysisContextImpl implements AnalysisContext {
     required this.sourceFactory,
   }) : _analysisOptionsMap = analysisOptionsMap;
 
-  @Deprecated("Use 'getAnalysisOptionsForFile(file)' instead")
-  @override
-  AnalysisOptionsImpl get analysisOptions {
-    return _analysisOptionsMap.firstOrDefault;
-  }
-
   // TODO(scheglov): Remove it, exists only for Cider.
   set analysisOptions(AnalysisOptionsImpl analysisOptions) {
     _analysisOptionsMap = AnalysisOptionsMap.forSharedOptions(analysisOptions);

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

@@ -363,10 +363,6 @@ class AnalysisDriver {
     return addedFiles.map(resourceProvider.getFile).toSet();
   }
 
-  /// Return the analysis options used to control analysis.
-  @Deprecated("Use 'getAnalysisOptionsForFile(file)' instead")
-  AnalysisOptions get analysisOptions => analysisOptionsMap.firstOrDefault;
-
   /// Return the current analysis session.
   AnalysisSessionImpl get currentSession {
     return libraryContext.elementFactory.analysisSession;

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

@@ -31,10 +31,6 @@ class DriverBasedAnalysisContext implements AnalysisContext {
     ...driver.analysisOptionsMap.entries.map((e) => e.options),
   ];
 
-  @override
-  @Deprecated("Use 'getAnalysisOptionsForFile(file)' instead")
-  AnalysisOptions get analysisOptions => driver.analysisOptions;
-
   @override
   AnalysisSession get currentSession => driver.currentSession;
 

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

@@ -125,8 +125,7 @@ class _FakeAnalysisDriver implements AnalysisDriver {
 class _MicroAnalysisContextImpl implements AnalysisContext {
   final FileResolver fileResolver;
 
-  @override
-  AnalysisOptionsImpl analysisOptions;
+  final AnalysisOptionsImpl analysisOptions;
 
   final ResourceProvider resourceProvider;
 

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

@@ -55,11 +55,6 @@ export 'package:analyzer/src/generated/timestamped_data.dart'
 /// the state after a refactoring.
 @AnalyzerPublicApi(message: 'exposed by Element.context')
 abstract class AnalysisContext {
-  /// Return the set of analysis options controlling the behavior of this
-  /// context. Clients should not modify the returned set of options.
-  @Deprecated("Use 'getAnalysisOptionsForFile(file)' instead")
-  AnalysisOptions get analysisOptions;
-
   /// Return the set of declared variables used when computing constant values.
   DeclaredVariables get declaredVariables;
 

pkg/analyzer/test/generated/test_analysis_context.dart

@@ -20,7 +20,7 @@ class TestAnalysisContext implements AnalysisContext {
   final SourceFactory sourceFactory = _MockSourceFactory();
 
   final _MockAnalysisSession _analysisSession = _MockAnalysisSession();
-  final AnalysisOptions _analysisOptions = AnalysisOptionsImpl();
+  final AnalysisOptions analysisOptions = AnalysisOptionsImpl();
 
   late TypeProviderImpl _typeProvider;
   late TypeSystemImpl _typeSystem;
@@ -39,9 +39,6 @@ class TestAnalysisContext implements AnalysisContext {
     _setLibraryTypeSystem(sdkElements.asyncLibrary);
   }
 
-  @override
-  AnalysisOptions get analysisOptions => _analysisOptions;
-
   AnalysisSessionImpl get analysisSession => _analysisSession;
 
   TypeProviderImpl get typeProvider {