CQ. Remove more deprecated non-APIs.

Change-Id: I546a30eaa6b18f68349d9941ffc36d8a5368592d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/456861 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -14,6 +14,7 @@
 * Remove deprecated `PartDirective.configurations`.
 * Remove deprecated `TypeDefiningElement`.
 * Remove deprecated `TypeAliasElement.aliasedElement`.
+* Remove deprecated `resolveFile2`.
 * Remove deprecated `ErrorCode`.
 * Remove deprecated `ErrorSeverity`.
 * Remove deprecated `ErrorType`.

pkg/analyzer/api.txt

@@ -577,7 +577,6 @@ package:analyzer/dart/analysis/utilities.dart:
  parseFile (function: ParseStringResult Function({required FeatureSet featureSet, required String path, ResourceProvider? resourceProvider, bool throwIfDiagnostics}))
  parseString (function: ParseStringResult Function({required String content, FeatureSet? featureSet, String? path, bool throwIfDiagnostics}))
  resolveFile (function: Future<SomeResolvedUnitResult> Function({required String path, ResourceProvider? resourceProvider}))
- resolveFile2 (function: Future<SomeResolvedUnitResult> Function({required String path, ResourceProvider? resourceProvider}), deprecated)
 package:analyzer/dart/ast/ast.dart:
  useDeclaringConstructorsAst (static getter: bool)
  useDeclaringConstructorsAst= (static setter: bool)

pkg/analyzer/lib/dart/analysis/utilities.dart

@@ -140,25 +140,6 @@ Future<SomeResolvedUnitResult> resolveFile({
  return await context.currentSession.getResolvedUnit(path);
 }
 
-/// Return the result of resolving the file at the given [path].
-///
-/// If a [resourceProvider] is given, it will be used to access the file system.
-///
-/// Note that if more than one file is going to be resolved then this function
-/// is inefficient. Clients should instead use [AnalysisContextCollection] to
-/// create one or more contexts and use those contexts to resolve the files.
-@Deprecated('Use resolveFile instead')
-Future<SomeResolvedUnitResult> resolveFile2({
- required String path,
- ResourceProvider? resourceProvider,
-}) async {
- AnalysisContext context = _createAnalysisContext(
- path: path,
- resourceProvider: resourceProvider,
- );
- return await context.currentSession.getResolvedUnit(path);
-}
-
 /// Return a newly create analysis context in which the file at the given [path]
 /// can be analyzed.
 ///

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

@@ -299,9 +299,7 @@ class AnalysisDriver {
  required this.withFineDependencies,
  this.ownedFiles,
  this.analysisContext,
- @Deprecated("Use 'analysisOptionsMap' instead")
- AnalysisOptionsImpl? analysisOptions,
- AnalysisOptionsMap? analysisOptionsMap,
+ required this.analysisOptionsMap,
  FileContentCache? fileContentCache,
  UnlinkedUnitStore? unlinkedUnitStore,
  this.enableIndex = false,
@@ -324,11 +322,6 @@ class AnalysisDriver {
  declaredVariables = declaredVariables ?? DeclaredVariables(),
  testingData = retainDataForTesting ? TestingData() : null,
  _enableLintRuleTiming = enableLintRuleTiming,
- // This '!' is temporary. The analysisOptionsMap is effectively
- // required but can't be until Google3 is updated.
- analysisOptionsMap = analysisOptions == null
- ? analysisOptionsMap!
- : AnalysisOptionsMap.forSharedOptions(analysisOptions),
  _saltForUnlinked = _calculateSaltForUnlinked(enableIndex: enableIndex),
  _saltForElements = _calculateSaltForElements(
  declaredVariables ?? DeclaredVariables(),

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

@@ -77,7 +77,7 @@ class DartSdkManager {
  Map<SdkDescription, DartSdk> sdkMap = HashMap<SdkDescription, DartSdk>();
 
  /// Initialize a newly created manager.
- DartSdkManager(this.defaultSdkDirectory, [@deprecated bool? canUseSummaries]);
+ DartSdkManager(this.defaultSdkDirectory);
 
  /// Return any SDK that has been created, or `null` if no SDKs have been
  /// created.