Skip to content

Commit b085dd5

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer: Simplify some FileAnalysis usage
ErrorVerifier no longer uses it. ImportsTracking can be set at creation-time, like other fields, and be final. Change-Id: Iac86d571faaeb4419ea54289f48e755a7a8f8a4d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431900 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 1d26804 commit b085dd5

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ class FileAnalysis {
1717
final CompilationUnitImpl unit;
1818
final LibraryFragmentImpl element;
1919
final IgnoreInfo ignoreInfo;
20-
late ImportsTracking importsTracking;
20+
final ImportsTracking importsTracking;
2121

2222
FileAnalysis({
2323
required this.file,
2424
required this.errorListener,
2525
required this.unit,
2626
required this.element,
2727
}) : errorReporter = ErrorReporter(errorListener, file.source),
28-
ignoreInfo = IgnoreInfo.forDart(unit, file.content);
28+
ignoreInfo = IgnoreInfo.forDart(unit, file.content),
29+
importsTracking = element.scope.importsTrackingInit();
2930
}

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ class LibraryAnalyzer {
107107
constructorFieldsVerifier: ConstructorFieldsVerifier(
108108
typeSystem: _typeSystem,
109109
),
110-
files: _libraryFiles,
111110
);
112111
}
113112

@@ -674,14 +673,6 @@ class LibraryAnalyzer {
674673
fileElement: _libraryElement.definingCompilationUnit,
675674
);
676675

677-
// Configure scopes for all files to track imports usages.
678-
// Associate tracking objects with file objects.
679-
for (var fileAnalysis in _libraryFiles.values) {
680-
var scope = fileAnalysis.element.scope;
681-
var tracking = scope.importsTrackingInit();
682-
fileAnalysis.importsTracking = tracking;
683-
}
684-
685676
for (var fileAnalysis in _libraryFiles.values) {
686677
_resolveFile(fileAnalysis);
687678
}

pkg/analyzer/lib/src/generated/error_verifier.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import 'package:analyzer/diagnostic/diagnostic.dart';
2020
import 'package:analyzer/error/error.dart';
2121
import 'package:analyzer/error/listener.dart';
2222
import 'package:analyzer/src/dart/analysis/analysis_options.dart';
23-
import 'package:analyzer/src/dart/analysis/file_analysis.dart';
2423
import 'package:analyzer/src/dart/analysis/file_state.dart';
2524
import 'package:analyzer/src/dart/ast/ast.dart';
2625
import 'package:analyzer/src/dart/ast/extensions.dart';
@@ -6537,7 +6536,6 @@ class LibraryVerificationContext {
65376536
final duplicationDefinitionContext = DuplicationDefinitionContext();
65386537
final LibraryFileKind libraryKind;
65396538
final ConstructorFieldsVerifier constructorFieldsVerifier;
6540-
final Map<FileState, FileAnalysis> files;
65416539

65426540
/// A table mapping names to the exported elements.
65436541
final Map<String, Element> _exportedElements = {};
@@ -6554,7 +6552,6 @@ class LibraryVerificationContext {
65546552
LibraryVerificationContext({
65556553
required this.libraryKind,
65566554
required this.constructorFieldsVerifier,
6557-
required this.files,
65586555
});
65596556

65606557
bool libraryCycleContains(Uri uri) {

0 commit comments

Comments
 (0)