Skip to content

Commit 3213c3a

Browse files
scheglovCommit Queue
authored andcommitted
Fine. Split into multiple logical libraries.
Only moving code around. I think the only renames are a couple enums made private. Change-Id: If2a81aab2401ca5dd4a2fb5834f7a29f868f714e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411881 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 4b9ed5e commit 3213c3a

23 files changed

+2559
-2489
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import 'package:analyzer/src/dart/analysis/feature_set_provider.dart';
2424
import 'package:analyzer/src/dart/analysis/file_content_cache.dart';
2525
import 'package:analyzer/src/dart/analysis/file_state.dart';
2626
import 'package:analyzer/src/dart/analysis/file_tracker.dart';
27-
import 'package:analyzer/src/dart/analysis/flags.dart';
2827
import 'package:analyzer/src/dart/analysis/index.dart';
2928
import 'package:analyzer/src/dart/analysis/info_declaration_store.dart';
3029
import 'package:analyzer/src/dart/analysis/library_analyzer.dart';
@@ -37,12 +36,12 @@ import 'package:analyzer/src/dart/analysis/status.dart';
3736
import 'package:analyzer/src/dart/analysis/testing_data.dart';
3837
import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart';
3938
import 'package:analyzer/src/dart/element/element.dart';
40-
import 'package:analyzer/src/dart/element/scope.dart';
4139
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
4240
import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
4341
import 'package:analyzer/src/diagnostic/diagnostic.dart';
4442
import 'package:analyzer/src/error/codes.dart';
4543
import 'package:analyzer/src/exception/exception.dart';
44+
import 'package:analyzer/src/fine/requirements.dart';
4645
import 'package:analyzer/src/generated/engine.dart'
4746
show AnalysisContext, AnalysisEngine;
4847
import 'package:analyzer/src/generated/source.dart' show SourceFactory;
@@ -52,7 +51,6 @@ import 'package:analyzer/src/summary/format.dart';
5251
import 'package:analyzer/src/summary/idl.dart';
5352
import 'package:analyzer/src/summary/package_bundle_reader.dart';
5453
import 'package:analyzer/src/summary2/ast_binary_flags.dart';
55-
import 'package:analyzer/src/summary2/bundle_manifest.dart';
5654
import 'package:analyzer/src/summary2/bundle_writer.dart';
5755
import 'package:analyzer/src/summary2/data_reader.dart';
5856
import 'package:analyzer/src/summary2/data_writer.dart';
@@ -102,7 +100,7 @@ import 'package:meta/meta.dart';
102100
// TODO(scheglov): Clean up the list of implicitly analyzed files.
103101
class AnalysisDriver {
104102
/// The version of data format, should be incremented on every format change.
105-
static const int DATA_VERSION = 432;
103+
static const int DATA_VERSION = 433;
106104

107105
/// The number of exception contexts allowed to write. Once this field is
108106
/// zero, we stop writing any new exception contexts in this process.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import 'package:analyzer/src/dart/analysis/driver.dart';
66
import 'package:analyzer/src/dart/analysis/file_state.dart';
77
import 'package:analyzer/src/dart/analysis/library_graph.dart';
8-
import 'package:analyzer/src/summary2/bundle_manifest.dart';
8+
import 'package:analyzer/src/fine/requirement_failure.dart';
9+
import 'package:analyzer/src/fine/requirements.dart';
910
import 'package:analyzer/src/summary2/linked_element_factory.dart';
1011

1112
/// An event that happened inside the [AnalysisDriver].

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import 'package:analyzer/src/dart/scanner/reader.dart';
3636
import 'package:analyzer/src/dart/scanner/scanner.dart';
3737
import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
3838
import 'package:analyzer/src/exception/exception.dart';
39+
import 'package:analyzer/src/fine/requirements.dart';
3940
import 'package:analyzer/src/generated/parser.dart';
4041
import 'package:analyzer/src/generated/source.dart' show SourceFactory;
4142
import 'package:analyzer/src/summary/api_signature.dart';
4243
import 'package:analyzer/src/summary/package_bundle_reader.dart';
43-
import 'package:analyzer/src/summary2/bundle_manifest.dart';
4444
import 'package:analyzer/src/summary2/informative_data.dart';
4545
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
4646
import 'package:analyzer/src/util/performance/operation_performance.dart';

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ import 'package:analyzer/src/dart/analysis/byte_store.dart';
2020
import 'package:analyzer/src/dart/analysis/driver.dart';
2121
import 'package:analyzer/src/dart/analysis/driver_event.dart';
2222
import 'package:analyzer/src/dart/analysis/file_state.dart';
23-
import 'package:analyzer/src/dart/analysis/flags.dart';
2423
import 'package:analyzer/src/dart/analysis/info_declaration_store.dart';
2524
import 'package:analyzer/src/dart/analysis/library_graph.dart';
2625
import 'package:analyzer/src/dart/analysis/performance_logger.dart';
2726
import 'package:analyzer/src/dart/analysis/session.dart';
2827
import 'package:analyzer/src/dart/element/element.dart';
29-
import 'package:analyzer/src/dart/element/scope.dart';
3028
import 'package:analyzer/src/exception/exception.dart';
29+
import 'package:analyzer/src/fine/library_manifest.dart';
30+
import 'package:analyzer/src/fine/requirements.dart';
3131
import 'package:analyzer/src/generated/source.dart';
3232
import 'package:analyzer/src/summary/package_bundle_reader.dart';
33-
import 'package:analyzer/src/summary2/bundle_manifest.dart';
3433
import 'package:analyzer/src/summary2/bundle_reader.dart';
3534
import 'package:analyzer/src/summary2/data_reader.dart';
3635
import 'package:analyzer/src/summary2/data_writer.dart';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:_fe_analyzer_shared/src/util/dependency_walker.dart' as graph
88
show DependencyWalker, Node;
99
import 'package:analyzer/src/dart/analysis/driver.dart';
1010
import 'package:analyzer/src/dart/analysis/file_state.dart';
11-
import 'package:analyzer/src/dart/analysis/flags.dart';
11+
import 'package:analyzer/src/fine/requirements.dart';
1212
import 'package:analyzer/src/summary/api_signature.dart';
1313
import 'package:analyzer/src/utilities/extensions/collection.dart';
1414
import 'package:collection/collection.dart';

pkg/analyzer/lib/src/dart/element/element.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import 'package:analyzer/error/error.dart';
2424
import 'package:analyzer/source/line_info.dart';
2525
import 'package:analyzer/source/source.dart';
2626
import 'package:analyzer/src/dart/analysis/experiments.dart';
27-
import 'package:analyzer/src/dart/analysis/flags.dart';
2827
import 'package:analyzer/src/dart/analysis/session.dart';
2928
import 'package:analyzer/src/dart/ast/ast.dart';
3029
import 'package:analyzer/src/dart/ast/token.dart';
@@ -45,12 +44,12 @@ import 'package:analyzer/src/dart/element/type_system.dart';
4544
import 'package:analyzer/src/dart/resolver/scope.dart'
4645
show Namespace, NamespaceBuilder;
4746
import 'package:analyzer/src/error/inference_error.dart';
47+
import 'package:analyzer/src/fine/library_manifest.dart';
4848
import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
4949
import 'package:analyzer/src/generated/source.dart' show DartUriResolver;
5050
import 'package:analyzer/src/generated/utilities_collection.dart';
5151
import 'package:analyzer/src/generated/utilities_dart.dart';
5252
import 'package:analyzer/src/summary2/ast_binary_tokens.dart';
53-
import 'package:analyzer/src/summary2/bundle_manifest.dart';
5453
import 'package:analyzer/src/summary2/bundle_reader.dart';
5554
import 'package:analyzer/src/summary2/export.dart';
5655
import 'package:analyzer/src/summary2/reference.dart';

pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import 'package:analyzer/dart/element/type.dart';
1010
import 'package:analyzer/src/dart/element/element.dart';
1111
import 'package:analyzer/src/dart/element/extensions.dart';
1212
import 'package:analyzer/src/dart/element/member.dart';
13-
import 'package:analyzer/src/dart/element/scope.dart';
1413
import 'package:analyzer/src/dart/element/type_algebra.dart';
1514
import 'package:analyzer/src/dart/element/type_system.dart';
15+
import 'package:analyzer/src/fine/requirements.dart';
1616
import 'package:analyzer/src/summary2/reference.dart';
1717
import 'package:analyzer/src/utilities/extensions/collection.dart';
1818
import 'package:analyzer/src/utilities/extensions/element.dart';

pkg/analyzer/lib/src/dart/element/scope.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@ import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
66
import 'package:analyzer/dart/analysis/features.dart';
77
import 'package:analyzer/dart/element/element2.dart';
88
import 'package:analyzer/dart/element/scope.dart';
9-
import 'package:analyzer/src/dart/analysis/flags.dart';
109
import 'package:analyzer/src/dart/element/element.dart';
1110
import 'package:analyzer/src/dart/element/extensions.dart';
12-
import 'package:analyzer/src/summary2/bundle_manifest.dart';
11+
import 'package:analyzer/src/fine/requirements.dart';
1312
import 'package:analyzer/src/summary2/combinator.dart';
1413
import 'package:analyzer/src/utilities/extensions/collection.dart';
1514

16-
/// When [withFineDependencies], this variable might be set to accumulate
17-
/// requirements for the analysis result being computed.
18-
BundleRequirementsManifest? linkingBundleManifest;
19-
2015
/// The scope for the initializers in a constructor.
2116
class ConstructorInitializerScope extends EnclosedScope {
2217
ConstructorInitializerScope(super.parent, ConstructorElement2 element) {

0 commit comments

Comments
 (0)