Skip to content

Commit cbdf307

Browse files
committed
Fixes for analyzer 8.
1 parent 7a25129 commit cbdf307

File tree

6 files changed

+28
-7
lines changed

6 files changed

+28
-7
lines changed

build/lib/src/analyzer/resolver.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// ignore_for_file: deprecated_member_use until analyzer 7 support is dropped.
6+
57
import 'package:analyzer/dart/analysis/results.dart';
68
import 'package:analyzer/dart/analysis/session.dart';
79
import 'package:analyzer/dart/ast/ast.dart';

build/lib/src/builder/build_step.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'dart:async';
66
import 'dart:convert';
77

8+
// ignore: deprecated_member_use until analyzer 7 support is dropped.
89
import 'package:analyzer/dart/element/element2.dart';
910
import 'package:package_config/package_config_types.dart';
1011

@@ -36,6 +37,7 @@ abstract class BuildStep implements AssetReader, AssetWriter {
3637
/// await step.resolver.libraryFor(step.inputId, allowSyntaxErrors: true);
3738
/// }
3839
/// ```
40+
// ignore: deprecated_member_use until analyzer 7 support is dropped.
3941
Future<LibraryElement2> get inputLibrary;
4042

4143
/// Gets an instance provided by [resource] which is guaranteed to be unique

build_resolvers/lib/src/resolver.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// ignore_for_file: deprecated_member_use until analyzer 7 support is dropped.
6+
57
import 'dart:async';
68
import 'dart:collection';
79
import 'dart:isolate';

build_resolvers/test/resolver_test.dart

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,13 @@ void runTests(ResolversFactory resolversFactory) {
668668
},
669669
(resolver) async {
670670
var main = (await resolver.findLibraryByName('web.main'))!;
671-
var meta = main.getClass2('Foo')!.supertype!.element.metadata[0];
671+
var meta =
672+
main
673+
.getClass2('Foo')!
674+
.supertype!
675+
.element3
676+
.metadata2
677+
.annotations[0];
672678
expect(meta, isNotNull);
673679
expect(meta.computeConstantValue()?.toIntValue(), 0);
674680
},
@@ -1139,8 +1145,7 @@ int? get x => 1;
11391145
expect(color.type.element!.name, equals('Color'));
11401146
expect(color.type.element!.library!.name, equals('dart.ui'));
11411147
expect(
1142-
color.type.element!.library!.definingCompilationUnit.source.uri
1143-
.toString(),
1148+
color.type.element3!.library2!.uri.toString(),
11441149
equals('dart:ui'),
11451150
);
11461151
} else {
@@ -1268,7 +1273,7 @@ int? get x => 1;
12681273
);
12691274
expect(unit, isA<FunctionDeclaration>());
12701275
expect(unit!.toSource(), 'main() {}');
1271-
expect((unit as FunctionDeclaration).declaredElement, isNull);
1276+
expect((unit as FunctionDeclaration).declaredFragment, isNull);
12721277
}, resolvers: createResolvers());
12731278
});
12741279

@@ -1283,7 +1288,11 @@ int? get x => 1;
12831288
unit,
12841289
isA<FunctionDeclaration>()
12851290
.having((fd) => fd.toSource(), 'toSource()', 'main() {}')
1286-
.having((fd) => fd.declaredElement, 'declaredElement', isNotNull),
1291+
.having(
1292+
(fd) => fd.declaredFragment,
1293+
'declaredElement',
1294+
isNotNull,
1295+
),
12871296
);
12881297
}, resolvers: createResolvers());
12891298
});
@@ -1304,7 +1313,11 @@ int? get x => 1;
13041313
(unit as CompilationUnit).declarations.single,
13051314
isA<FunctionDeclaration>()
13061315
.having((fd) => fd.toSource(), 'toSource()', 'main() {}')
1307-
.having((fd) => fd.declaredElement, 'declaredElement', isNotNull),
1316+
.having(
1317+
(fd) => fd.declaredFragment,
1318+
'declaredFragment',
1319+
isNotNull,
1320+
),
13081321
);
13091322
});
13101323
});

build_runner_core/lib/src/generate/build_step_impl.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// ignore_for_file: deprecated_member_use until analyzer 7 support is dropped.
6+
57
import 'dart:async';
68
import 'dart:collection';
79
import 'dart:convert';

build_test/test/resolve_source_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void main() {
197197
}
198198

199199
String _toStringId(InterfaceType t) =>
200-
'${t.element.source.uri.toString().split('/').first}#${t.element.name}';
200+
'${t.element3.library2.uri.toString().split('/').first}#${t.element.name}';
201201

202202
extension on Resolver {
203203
Future<LibraryElement2> findLibraryNotNull(String name) async {

0 commit comments

Comments
 (0)