Skip to content

Stop using deprecated analyzer API. #4248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2025
Merged

Stop using deprecated analyzer API. #4248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions analysis_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ analyzer:
# TODO(davidmorgan): update code for this lint.
discarded_futures: ignore
exclude:
# Prevents extra work during some e2e test runs.
- "dart2js_test/**"
# Common top level directories containing generated files in any package.
- ".dart_tool/**"
- "build_runner/test/fixtures/**"

linter:
rules:
Expand Down
65 changes: 31 additions & 34 deletions build_runner/lib/src/build/resolver/resolver.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

// ignore_for_file: deprecated_member_use until analyzer 7 support is dropped.

import 'dart:async';
import 'dart:collection';
import 'dart:isolate';

import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/error/error.dart';
// ignore: implementation_imports
Expand Down Expand Up @@ -49,11 +47,11 @@ class PerActionResolver implements ReleasableResolver {
this._step,
);

Stream<LibraryElement2> get _librariesFromEntrypoints async* {
Stream<LibraryElement> get _librariesFromEntrypoints async* {
await _resolveIfNecessary(_step.inputId, transitive: true);

final seen = <LibraryElement2>{};
final toVisit = Queue<LibraryElement2>();
final seen = <LibraryElement>{};
final toVisit = Queue<LibraryElement>();

// keep a copy of entry points in case [_resolveIfNecessary] is called
// before this stream is done.
Expand All @@ -74,11 +72,11 @@ class PerActionResolver implements ReleasableResolver {
// model manually.
yield current;
final toCrawl =
current.firstFragment.libraryImports2
.map((import) => import.importedLibrary2)
current.firstFragment.libraryImports
.map((import) => import.importedLibrary)
.followedBy(
current.firstFragment.libraryExports2.map(
(export) => export.exportedLibrary2,
current.firstFragment.libraryExports.map(
(export) => export.exportedLibrary,
),
)
.nonNulls
Expand All @@ -90,16 +88,16 @@ class PerActionResolver implements ReleasableResolver {
}

@override
Stream<LibraryElement2> get libraries async* {
Stream<LibraryElement> get libraries async* {
yield* _delegate.sdkLibraries;
yield* _librariesFromEntrypoints.where((library) => !library.isInSdk);
}

@override
Future<LibraryElement2?> findLibraryByName(String libraryName) =>
Future<LibraryElement?> findLibraryByName(String libraryName) =>
_step.trackStage('findLibraryByName $libraryName', () async {
await for (final library in libraries) {
if (library.name3 == libraryName) return library;
if (library.name == libraryName) return library;
}
return null;
});
Expand Down Expand Up @@ -135,7 +133,7 @@ class PerActionResolver implements ReleasableResolver {
});

@override
Future<LibraryElement2> libraryFor(
Future<LibraryElement> libraryFor(
AssetId assetId, {
bool allowSyntaxErrors = false,
}) => _step.trackStage('libraryFor $assetId', () async {
Expand Down Expand Up @@ -189,7 +187,7 @@ class PerActionResolver implements ReleasableResolver {
}

@override
Future<AssetId> assetIdForElement(Element2 element) =>
Future<AssetId> assetIdForElement(Element element) =>
_delegate.assetIdForElement(element);
}

Expand All @@ -199,7 +197,7 @@ class AnalyzerResolver implements ReleasableResolver {
final AnalyzeActivityPool _driverPool;
final SharedResourcePool _readAndWritePool;

Future<List<LibraryElement2>>? _sdkLibraries;
Future<List<LibraryElement>>? _sdkLibraries;

AnalyzerResolver(
this._driver,
Expand Down Expand Up @@ -269,15 +267,15 @@ class AnalyzerResolver implements ReleasableResolver {
final parsedResult =
_driver.currentSession.getParsedUnit(path) as ParsedUnitResult;
if (!allowSyntaxErrors &&
parsedResult.errors.any((e) => e.severity == Severity.error)) {
parsedResult.diagnostics.any((e) => e.severity == Severity.error)) {
throw SyntaxErrorInAssetException(assetId, [parsedResult]);
}
return parsedResult.unit;
});
}

@override
Future<LibraryElement2> libraryFor(
Future<LibraryElement> libraryFor(
AssetId assetId, {
bool allowSyntaxErrors = false,
}) async {
Expand All @@ -302,21 +300,19 @@ class AnalyzerResolver implements ReleasableResolver {
);

if (!allowSyntaxErrors) {
final errors = await _syntacticErrorsFor(library.element2);
final errors = await _syntacticErrorsFor(library.element);
if (errors.isNotEmpty) {
throw SyntaxErrorInAssetException(assetId, errors);
}
}

return library.element2;
return library.element;
}

/// Finds syntax errors in files related to the [element].
///
/// This includes the main library and existing part files.
Future<List<ErrorsResult>> _syntacticErrorsFor(
LibraryElement2 element,
) async {
Future<List<ErrorsResult>> _syntacticErrorsFor(LibraryElement element) async {
final existingSources = <Source>[];

for (final fragment in element.fragments) {
Expand All @@ -335,8 +331,9 @@ class AnalyzerResolver implements ReleasableResolver {
for (final path in paths) {
final result = await _driver.currentSession.getErrors(path);
if (result is ErrorsResult &&
result.errors.any(
(error) => error.errorCode.type == ErrorType.SYNTACTIC_ERROR,
result.diagnostics.any(
(error) =>
error.diagnosticCode.type == DiagnosticType.SYNTACTIC_ERROR,
)) {
relevantResults.add(result);
}
Expand All @@ -351,13 +348,13 @@ class AnalyzerResolver implements ReleasableResolver {
void release() {}

@override
Stream<LibraryElement2> get libraries {
Stream<LibraryElement> get libraries {
// We don't know what libraries to expose without leaking libraries written
// by later phases.
throw UnimplementedError();
}

Stream<LibraryElement2> get sdkLibraries {
Stream<LibraryElement> get sdkLibraries {
final loadLibraries =
_sdkLibraries ??= Future.sync(() {
final publicSdkUris = _driver.sdkLibraryUris.where(
Expand All @@ -370,7 +367,7 @@ class AnalyzerResolver implements ReleasableResolver {
final result =
await _driver.currentSession.getLibraryByUri(uri.toString())
as LibraryElementResult;
return result.element2;
return result.element;
});
}),
);
Expand All @@ -380,28 +377,28 @@ class AnalyzerResolver implements ReleasableResolver {
}

@override
Future<LibraryElement2> findLibraryByName(String libraryName) {
Future<LibraryElement> findLibraryByName(String libraryName) {
// We don't know what libraries to expose without leaking libraries written
// by later phases.
throw UnimplementedError();
}

@override
Future<AssetId> assetIdForElement(Element2 element) async {
if (element is MultiplyDefinedElement2) {
throw UnresolvableAssetException('${element.name3} is ambiguous');
Future<AssetId> assetIdForElement(Element element) async {
if (element is MultiplyDefinedElement) {
throw UnresolvableAssetException('${element.name} is ambiguous');
}

final source = element.firstFragment.libraryFragment?.source;
if (source == null) {
throw UnresolvableAssetException(
'${element.name3} does not have a source',
'${element.name} does not have a source',
);
}

final uri = source.uri;
if (!uri.isScheme('package') && !uri.isScheme('asset')) {
throw UnresolvableAssetException('${element.name3} in ${source.uri}');
throw UnresolvableAssetException('${element.name} in ${source.uri}');
}
return AssetId.resolve(source.uri);
}
Expand Down
Loading