Skip to content

Commit 923400a

Browse files
iinozemtsevcopybara-github
authored andcommitted
Migrate to new Analyzer API.
PiperOrigin-RevId: 766175031
1 parent e31b82d commit 923400a

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
## 5.4.7-wip
2+
3+
* Require Dart SDK ^3.7.0.
4+
15
## 5.4.6
26

37
* When formatting a generated mocks library, use the language version of the
48
library with the mockito annotation.
5-
* Require Dart SDK ^3.7.0.
6-
* Require `analyzer: '>=7.4.1 <8.0.0'`.
79

810
## 5.4.5
911

lib/src/builder.dart

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ import 'package:analyzer/src/dart/element/inheritance_manager3.dart'
3232
import 'package:analyzer/src/dart/element/member.dart' show ExecutableMember;
3333
// ignore: implementation_imports
3434
import 'package:analyzer/src/dart/element/type_algebra.dart' show Substitution;
35-
// ignore: implementation_imports
36-
import 'package:analyzer/src/utilities/extensions/element.dart';
3735
import 'package:build/build.dart';
3836
// Do not expose [refer] in the default namespace.
3937
//
@@ -90,21 +88,21 @@ class MockBuilder implements Builder {
9088

9189
final inheritanceManager = InheritanceManager3();
9290
final mockTargetGatherer = _MockTargetGatherer(
93-
entryLib.asElement2,
91+
entryLib,
9492
inheritanceManager,
9593
);
9694

9795
final assetUris = await _resolveAssetUris(
9896
buildStep.resolver,
9997
mockTargetGatherer._mockTargets,
10098
mockLibraryAsset.path,
101-
entryLib.asElement2,
99+
entryLib,
102100
);
103101

104102
final mockLibraryInfo = _MockLibraryInfo(
105103
mockTargetGatherer._mockTargets,
106104
assetUris: assetUris,
107-
entryLib: entryLib.asElement2,
105+
entryLib: entryLib,
108106
inheritanceManager: inheritanceManager,
109107
);
110108

@@ -162,7 +160,7 @@ class MockBuilder implements Builder {
162160
languageVersion: entryLib.languageVersion.effective,
163161
).format('''
164162
// Mocks generated by Mockito $packageVersion from annotations
165-
// in ${entryLib.asElement2.firstFragment.source.uri.path}.
163+
// in ${entryLib.firstFragment.source.uri.path}.
166164
// Do not manually edit this file.
167165
168166
@@ -243,11 +241,7 @@ $rawOutput
243241
final exportingLibrary = _findExportOf(librariesWithTypes, element);
244242

245243
try {
246-
final typeAssetId = await resolver.assetIdForElement(
247-
// Use element1 until `assetIdForElement` accepts element2.
248-
// ignore: deprecated_member_use
249-
exportingLibrary.asElement,
250-
);
244+
final typeAssetId = await resolver.assetIdForElement(exportingLibrary);
251245

252246
if (typeAssetId.path.startsWith('lib/')) {
253247
typeUris[element] = typeAssetId.uri.toString();
@@ -1259,7 +1253,9 @@ class _MockClassInfo {
12591253
typeAlias?.element2.aliasedType as analyzer.InterfaceType?;
12601254
final typeToMock = aliasedType ?? mockTarget.classType;
12611255
final classToMock = mockTarget.interfaceElement;
1262-
final classIsImmutable = classToMock.metadata.any((it) => it.isImmutable);
1256+
final classIsImmutable = classToMock.metadata2.annotations.any(
1257+
(it) => it.isImmutable,
1258+
);
12631259
final className = aliasedElement?.name3 ?? classToMock.name3;
12641260

12651261
return Class((cBuilder) {

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ environment:
1313
sdk: ^3.7.0
1414

1515
dependencies:
16-
analyzer: '>=7.4.1 <8.0.0'
16+
analyzer: '>=6.9.0 <8.0.0'
1717
build: ^2.4.1
1818
code_builder: ^4.5.0
1919
collection: ^1.19.0

0 commit comments

Comments
 (0)