code review

Author: christopherfujino

tools/const_finder/bin/main.dart

@@ -59,11 +59,30 @@ void main(List<String> args) {
     ..addFlag('help',
         abbr: 'h',
         negatable: false,
-        help: 'Print usage and exit');
+        help: 'Print usage and exit')
+    ..addOption('annotation-class-name',
+        help: 'The class name of the annotation for classes that should be '
+              'ignored.',
+        valueHelp: 'StaticIconProvider')
+    ..addOption('annotation-class-library-uri',
+        help: 'The package: URI of the class of the annotation for classes '
+              'that should be ignored.',
+        valueHelp: 'package:flutter/src/material/icons.dart');
 
   final ArgResults argResults = parser.parse(args);
   T getArg<T>(String name) => argResults[name] as T;
 
+  final String? annotationClassName = getArg<String?>('annotation-class-name');
+  final String? annotationClassLibraryUri = getArg<String?>('annotation-class-library-uri');
+
+  final bool annotationClassNameProvided = annotationClassName != null;
+  final bool annotationClassLibraryUriProvided = annotationClassLibraryUri != null;
+  if (annotationClassNameProvided != annotationClassLibraryUriProvided) {
+    throw StateError(
+      'If either "--annotation-class-name" or "--annotation-class-library-uri" are provided they both must be',
+    );
+  }
+
   if (getArg<bool>('help')) {
     stdout.writeln(parser.usage);
     exit(0);
@@ -73,6 +92,8 @@ void main(List<String> args) {
     kernelFilePath: getArg<String>('kernel-file'),
     classLibraryUri: getArg<String>('class-library-uri'),
     className: getArg<String>('class-name'),
+    annotationClassName: annotationClassName,
+    annotationClassLibraryUri: annotationClassLibraryUri,
   );
 
   final JsonEncoder encoder = getArg<bool>('pretty')

tools/const_finder/lib/const_finder.dart

@@ -11,6 +11,8 @@ class _ConstVisitor extends RecursiveVisitor<void> {
     this.kernelFilePath,
     this.classLibraryUri,
     this.className,
+    this.annotationClassLibraryUri,
+    this.annotationClassName,
   )  : _visitedInstances = <String>{},
        constantInstances = <Map<String, dynamic>>[],
        nonConstantLocations = <Map<String, dynamic>>[];
@@ -30,6 +32,14 @@ class _ConstVisitor extends RecursiveVisitor<void> {
 
   bool inIgnoredClass = false;
 
+  /// The name of the name of the class of the annotation marking classes
+  /// whose constant references should be ignored.
+  final String? annotationClassName;
+
+  /// The library URI of the class of the annotation marking classes whose
+  /// constant references should be ignored.
+  final String? annotationClassLibraryUri;
+
   // A cache of previously evaluated classes.
   static final Map<Class, bool> _classHeirarchyCache = <Class, bool>{};
   bool _matches(Class node) {
@@ -76,27 +86,27 @@ class _ConstVisitor extends RecursiveVisitor<void> {
 
   @override
   void visitClass(Class node) {
-    // Check if this is a class that we should ignore.
-    if (!_isStaticIconProvider(node)) {
-      // Not an ignored class.
-      super.visitClass(node);
-      return;
-    }
-    inIgnoredClass = true;
+    // check if this is a class that we should ignore
+    inIgnoredClass = _classShouldBeIgnored(node);
     super.visitClass(node);
     inIgnoredClass = false;
   }
 
-  // Constants from classes annotated with an instance of StaticIconProvider
-  // should be ignored.
-  bool _isStaticIconProvider(Class node) {
+  // If any annotations on the class match annotationClassName AND
+  // annotationClassLibraryUri.
+  bool _classShouldBeIgnored(Class node) {
+    if (annotationClassName == null || annotationClassLibraryUri == null) {
+      return false;
+    }
     return node.annotations.any((Expression expression) {
       if (expression is! ConstantExpression) {
         return false;
       }
 
-      final DartType type = expression.type;
-      return type is InterfaceType && type.classNode.name == 'StaticIconProvider';
+      final Constant constant = expression.constant;
+      return constant is InstanceConstant
+          && constant.classNode.name == annotationClassName
+          && constant.classNode.enclosingLibrary.importUri.toString() == annotationClassLibraryUri;
     });
   }
 
@@ -131,10 +141,14 @@ class ConstFinder {
     required String kernelFilePath,
     required String classLibraryUri,
     required String className,
+    String? annotationClassLibraryUri,
+    String? annotationClassName,
   })  : _visitor = _ConstVisitor(
                     kernelFilePath,
                     classLibraryUri,
                     className,
+                    annotationClassLibraryUri,
+                    annotationClassName,
                   );
 
   final _ConstVisitor _visitor;

tools/const_finder/test/const_finder_test.dart

@@ -122,6 +122,8 @@ void _checkAnnotation(String dillPath, Compiler compiler) {
     kernelFilePath: dillPath,
     classLibraryUri: 'package:const_finder_fixtures/target.dart',
     className: 'Target',
+    annotationClassName: 'StaticIconProvider',
+    annotationClassLibraryUri: 'package:const_finder_fixtures/static_icon_provider.dart',
   );
   expectInstances(
     finder.findInstances(),
@@ -262,7 +264,7 @@ Future<void> main(List<String> args) async {
       sdkRoot: sdkRoot,
       librariesSpec: librariesSpec,
       verify: _checkRecursion,
-      compiler: Compiler.frontendServer,
+      compiler: Compiler.aot,
     ),
     _Test(
       name: 'box_web',
@@ -280,7 +282,7 @@ Future<void> main(List<String> args) async {
       sdkRoot: sdkRoot,
       librariesSpec: librariesSpec,
       verify: _checkConsts,
-      compiler: Compiler.frontendServer,
+      compiler: Compiler.aot,
     ),
     _Test(
       name: 'consts_web',
@@ -298,7 +300,7 @@ Future<void> main(List<String> args) async {
       sdkRoot: sdkRoot,
       librariesSpec: librariesSpec,
       verify: _checkNonConstsFrontend,
-      compiler: Compiler.frontendServer,
+      compiler: Compiler.aot,
     ),
     _Test(
       name: 'consts_and_non_web',
@@ -316,7 +318,7 @@ Future<void> main(List<String> args) async {
       sdkRoot: sdkRoot,
       librariesSpec: librariesSpec,
       verify: _checkAnnotation,
-      compiler: Compiler.frontendServer,
+      compiler: Compiler.aot,
     ),
     _Test(
       name: 'static_icon_provider_web',
@@ -347,7 +349,7 @@ Future<void> main(List<String> args) async {
 
 enum Compiler {
   // Uses TFA tree-shaking.
-  frontendServer,
+  aot,
   // Does not have TFA tree-shaking.
   dart2js,
 }
@@ -377,8 +379,8 @@ class _Test {
   void run() {
     stdout.writeln('Compiling $dartSource to $dillPath with $compiler');
 
-    if (compiler == Compiler.frontendServer) {
-      _compileTFADill();
+    if (compiler == Compiler.aot) {
+      _compileAOTDill();
     } else {
       _compileWebDill();
     }
@@ -395,7 +397,7 @@ class _Test {
     }
   }
 
-  void _compileTFADill() {
+  void _compileAOTDill() {
     checkProcessResult(Process.runSync(dart, <String>[
       frontendServer,
       '--sdk-root=$sdkRoot',