Rename TypeNameTracker to NamedTypeTracker.

Change-Id: I097f5267d0bbc172f68ec685d35d3cee09312fb8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214128
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2021-09-22 14:54:16 +00:00 committed by commit-bot@chromium.org
parent e0518b47cf
commit 3d0a6845e4
2 changed files with 8 additions and 8 deletions

View file

@ -4,8 +4,8 @@
import 'package:analyzer/dart/ast/ast.dart';
import 'package:nnbd_migration/src/utilities/annotation_tracker.dart';
import 'package:nnbd_migration/src/utilities/named_type_tracker.dart';
import 'package:nnbd_migration/src/utilities/permissive_mode.dart';
import 'package:nnbd_migration/src/utilities/type_name_tracker.dart';
/// Mixin that verifies (via assertion checks) that a visitor visits a
/// compilation unit to "completeness" -- currently tracks Annotations and
@ -15,7 +15,7 @@ import 'package:nnbd_migration/src/utilities/type_name_tracker.dart';
/// disabled.
mixin CompletenessTracker<T> on AstVisitor<T>, PermissiveModeVisitor<T> {
AnnotationTracker? _annotationTracker;
TypeNameTracker? _typeNameTracker;
NamedTypeTracker? _namedTypeTracker;
void annotationVisited(Annotation node) {
assert(() {
@ -26,7 +26,7 @@ mixin CompletenessTracker<T> on AstVisitor<T>, PermissiveModeVisitor<T> {
void namedTypeVisited(NamedType node) {
assert(() {
_typeNameTracker!.nodeVisited(node);
_namedTypeTracker!.nodeVisited(node);
return true;
}());
}
@ -43,21 +43,21 @@ mixin CompletenessTracker<T> on AstVisitor<T>, PermissiveModeVisitor<T> {
reportExceptionsIfPermissive(node, () {
assert(() {
assert(_annotationTracker == null);
assert(_typeNameTracker == null);
assert(_namedTypeTracker == null);
_annotationTracker = AnnotationTracker()..visitCompilationUnit(node);
_typeNameTracker = TypeNameTracker()..visitCompilationUnit(node);
_namedTypeTracker = NamedTypeTracker()..visitCompilationUnit(node);
return true;
}());
try {
result = super.visitCompilationUnit(node);
assert(() {
_annotationTracker!.finalize();
_typeNameTracker!.finalize();
_namedTypeTracker!.finalize();
return true;
}());
} finally {
_annotationTracker = null;
_typeNameTracker = null;
_namedTypeTracker = null;
}
});
return result;

View file

@ -6,7 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart';
/// A simple class to find all [NamedType]s and track if they all get visited.
class TypeNameTracker extends RecursiveAstVisitor<void> {
class NamedTypeTracker extends RecursiveAstVisitor<void> {
final Set<NamedType> _nodes = {};
bool _isTrueNamedType(NamedType node) {