Skip to content

Commit a1f5100

Browse files
scheglovcommit-bot@chromium.org
scheglov
authored and
[email protected]
committed
Use analyzer 0.39.12 in nnbd_migration.
So, we can use package:analyzer/src/dart/element/type_system.dart instead of src/generated/... library. [email protected], [email protected] Change-Id: Ic804cd29429bf8a85d25e21f77292a6816a3ede7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153363 Reviewed-by: Paul Berry <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 7255b99 commit a1f5100

6 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎pkg/nnbd_migration/lib/src/edge_builder.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import 'package:analyzer/dart/ast/visitor.dart';
99
import 'package:analyzer/dart/element/element.dart';
1010
import 'package:analyzer/dart/element/type.dart';
1111
import 'package:analyzer/dart/element/type_provider.dart';
12+
import 'package:analyzer/dart/element/type_system.dart';
1213
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
1314
import 'package:analyzer/src/dart/element/type.dart';
15+
import 'package:analyzer/src/dart/element/type_system.dart' show TypeSystemImpl;
1416
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
1517
import 'package:analyzer/src/error/best_practices_verifier.dart';
1618
import 'package:analyzer/src/generated/source.dart';
17-
import 'package:analyzer/src/generated/type_system.dart';
1819
import 'package:meta/meta.dart';
1920
import 'package:nnbd_migration/fix_reason_target.dart';
2021
import 'package:nnbd_migration/instrumentation.dart';

‎pkg/nnbd_migration/lib/src/fix_builder.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
1919
import 'package:analyzer/src/dart/element/member.dart';
2020
import 'package:analyzer/src/dart/element/type.dart';
2121
import 'package:analyzer/src/dart/element/type_provider.dart';
22+
import 'package:analyzer/src/dart/element/type_system.dart';
2223
import 'package:analyzer/src/error/best_practices_verifier.dart';
2324
import 'package:analyzer/src/generated/element_type_provider.dart';
2425
import 'package:analyzer/src/generated/migration.dart';
2526
import 'package:analyzer/src/generated/resolver.dart';
2627
import 'package:analyzer/src/generated/source.dart';
27-
import 'package:analyzer/src/generated/type_system.dart';
2828
import 'package:analyzer/src/generated/utilities_dart.dart';
2929
import 'package:analyzer/src/task/strong/checker.dart';
3030
import 'package:nnbd_migration/fix_reason_target.dart';

‎pkg/nnbd_migration/lib/src/nullability_migration_impl.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import 'package:analyzer/dart/analysis/results.dart';
66
import 'package:analyzer/file_system/physical_file_system.dart';
77
import 'package:analyzer/src/dart/analysis/session.dart';
8+
import 'package:analyzer/src/dart/element/type_system.dart';
89
import 'package:analyzer/src/generated/source.dart';
9-
import 'package:analyzer/src/generated/type_system.dart';
1010
import 'package:analyzer_plugin/protocol/protocol_common.dart';
1111
import 'package:nnbd_migration/instrumentation.dart';
1212
import 'package:nnbd_migration/nnbd_migration.dart';

‎pkg/nnbd_migration/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66
sdk: '>=2.6.0 <3.0.0'
77
dependencies:
88
_fe_analyzer_shared: ^4.0.0
9-
analyzer: ^0.39.11-dev
9+
analyzer: ^0.39.12
1010
analyzer_plugin: ^0.2.4
1111
args: ^1.4.4
1212
charcode: ^1.1.2

‎pkg/nnbd_migration/test/edge_builder_test.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import 'package:analyzer/dart/element/element.dart';
77
import 'package:analyzer/dart/element/nullability_suffix.dart';
88
import 'package:analyzer/dart/element/type.dart';
99
import 'package:analyzer/dart/element/type_provider.dart';
10+
import 'package:analyzer/dart/element/type_system.dart';
1011
import 'package:analyzer/src/dart/element/element.dart';
1112
import 'package:analyzer/src/dart/element/type.dart';
1213
import 'package:analyzer/src/dart/element/type_provider.dart';
14+
import 'package:analyzer/src/dart/element/type_system.dart' show TypeSystemImpl;
1315
import 'package:analyzer/src/dart/error/hint_codes.dart';
1416
import 'package:analyzer/src/generated/source.dart';
1517
import 'package:analyzer/src/generated/testing/test_type_provider.dart';
16-
import 'package:analyzer/src/generated/type_system.dart';
1718
import 'package:nnbd_migration/fix_reason_target.dart';
1819
import 'package:nnbd_migration/instrumentation.dart';
1920
import 'package:nnbd_migration/src/decorated_class_hierarchy.dart';

‎pkg/nnbd_migration/test/migration_visitor_test_base.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'package:analyzer/dart/element/nullability_suffix.dart';
88
import 'package:analyzer/dart/element/type_provider.dart';
99
import 'package:analyzer/src/dart/element/element.dart';
1010
import 'package:analyzer/src/dart/element/type.dart';
11+
import 'package:analyzer/src/dart/element/type_system.dart';
1112
import 'package:analyzer/src/generated/source.dart';
12-
import 'package:analyzer/src/generated/type_system.dart';
1313
import 'package:analyzer/src/generated/utilities_dart.dart';
1414
import 'package:meta/meta.dart';
1515
import 'package:nnbd_migration/instrumentation.dart';

0 commit comments

Comments
 (0)