Remove deprecated AnalysisContext.analysisOptions
Change-Id: Ie89087c4cbab17207371254d896f5b2be4ed437b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427602
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/CHANGELOG.md b/pkg/analyzer/CHANGELOG.md
index 35a2865..e246848 100644
--- a/pkg/analyzer/CHANGELOG.md
+++ b/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
diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index 2977473..5522429 100644
--- a/pkg/analyzer/api.txt
+++ b/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/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)
diff --git a/pkg/analyzer/lib/dart/analysis/analysis_context.dart b/pkg/analyzer/lib/dart/analysis/analysis_context.dart
index 4c4d120..eeb3aae 100644
--- a/pkg/analyzer/lib/dart/analysis/analysis_context.dart
+++ b/pkg/analyzer/lib/dart/analysis/analysis_context.dart
@@ -19,10 +19,6 @@
///
/// 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;
diff --git a/pkg/analyzer/lib/src/context/context.dart b/pkg/analyzer/lib/src/context/context.dart
index 175d1d5..4c918e1 100644
--- a/pkg/analyzer/lib/src/context/context.dart
+++ b/pkg/analyzer/lib/src/context/context.dart
@@ -31,12 +31,6 @@
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);
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 26c9c9b..d3f907b 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -363,10 +363,6 @@
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;
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart b/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart
index 31f064c..afd8a1e 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart
@@ -32,10 +32,6 @@
];
@override
- @Deprecated("Use 'getAnalysisOptionsForFile(file)' instead")
- AnalysisOptions get analysisOptions => driver.analysisOptions;
-
- @override
AnalysisSession get currentSession => driver.currentSession;
@override
diff --git a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
index 689add1..65e1285 100644
--- a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
@@ -125,8 +125,7 @@
class _MicroAnalysisContextImpl implements AnalysisContext {
final FileResolver fileResolver;
- @override
- AnalysisOptionsImpl analysisOptions;
+ final AnalysisOptionsImpl analysisOptions;
final ResourceProvider resourceProvider;
diff --git a/pkg/analyzer/lib/src/generated/engine.dart b/pkg/analyzer/lib/src/generated/engine.dart
index a51070a..694ccf8 100644
--- a/pkg/analyzer/lib/src/generated/engine.dart
+++ b/pkg/analyzer/lib/src/generated/engine.dart
@@ -55,11 +55,6 @@
/// 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;
diff --git a/pkg/analyzer/test/generated/test_analysis_context.dart b/pkg/analyzer/test/generated/test_analysis_context.dart
index 6263255..b791af6 100644
--- a/pkg/analyzer/test/generated/test_analysis_context.dart
+++ b/pkg/analyzer/test/generated/test_analysis_context.dart
@@ -20,7 +20,7 @@
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 @@
_setLibraryTypeSystem(sdkElements.asyncLibrary);
}
- @override
- AnalysisOptions get analysisOptions => _analysisOptions;
-
AnalysisSessionImpl get analysisSession => _analysisSession;
TypeProviderImpl get typeProvider {
