Remove pkg/front_end's remaining dependencies on pkg/analyzer.

pkg/front_end/test/subpackage_relationships_test.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:front_end/compiler_options.dart';
 import 'package:front_end/dependency_grapher.dart';
 import 'package:path/path.dart' as pathos;
 
 main() async {
   exit(await new _SubpackageRelationshipsTest().run());
 }
 
 /// List of packages that front_end is allowed to directly depend on.
 ///
 /// Note that this script only checks files in pkg/front_end/lib, so this list
 /// excludes dev dependencies.
-///
-/// TODO(paulberry): remove dependencies on analyzer.
 final allowedPackageDependencies = [
-  'analyzer',
   'charcode',
   'convert',
   'crypto',
   'kernel',
   'meta',
   'package_config',
   'path',
   'source_span',
   'testing',
 ];
 
 /// Map from subpackage name to the rules for what the subpackage is allowed to
 /// depend directly on.
 ///
 /// Each listed directory is considered a subpackage.  Each package contains all
 /// of its descendant files that are not in a more deeply nested subpackage.
 ///
 /// TODO(paulberry): stuff in lib/src shouldn't depend on lib; lib should just
 /// re-export stuff in lib/src.
-/// TODO(paulberry): remove dependencies on analyzer.
 final subpackageRules = {
-  'lib': new SubpackageRules(mayImportAnalyzer: true, allowedDependencies: [
+  'lib': new SubpackageRules(allowedDependencies: [
     'lib/src',
     'lib/src/base',
     'lib/src/fasta',
     'lib/src/fasta/dill',
     'lib/src/fasta/kernel',
     'lib/src/incremental'
   ]),
-  'lib/src': new SubpackageRules(mayImportAnalyzer: true, allowedDependencies: [
+  'lib/src': new SubpackageRules(allowedDependencies: [
     'lib',
     'lib/src/base',
     'lib/src/fasta',
     "lib/src/fasta/dill",
     "lib/src/fasta/kernel",
     'lib/src/fasta/source',
     'lib/src/incremental',
   ]),
   'lib/src/base': new SubpackageRules(allowedDependencies: [
     'lib',
@@ skipping 91 matching lines @@
     // fasta scanner produces analyzer scanner tokens
     'lib/src/fasta/scanner',
   ]),
   'lib/src/testing': new SubpackageRules(allowedDependencies: [
     'lib',
   ]),
 };
 
 /// Rules for what a subpackage may depend directly on.
 class SubpackageRules {
-  /// Indicates whether the subpackage may directly depend on analyzer.
-  final bool mayImportAnalyzer;
-
   /// Indicates whether dart files may exist in subdirectories of this
   /// subpackage.
   ///
   /// If `false`, any subdirectory of this subpackage must be a separate
   /// subpackage.
   final bool allowSubdirs;
 
   /// Indicates which other subpackages a given subpackage may directly depend
   /// on.
   final List<String> allowedDependencies;
 
   var actuallyContainsFiles = false;
 
-  var actuallyImportsAnalyzer = false;
-
   var actuallyHasSubdirs = false;
 
   var actualDependencies = new Set<String>();
 
   SubpackageRules(
-      {this.mayImportAnalyzer: false,
-      this.allowSubdirs: false,
-      this.allowedDependencies: const []});
+      {this.allowSubdirs: false, this.allowedDependencies: const []});
 }
 
 class _SubpackageRelationshipsTest {
   /// File uri of the front_end package's "lib" directory.
   final frontEndLibUri = Platform.script.resolve('../lib/');
 
   /// Indicates whether any problems have been reported yet.
   bool problemsReported = false;
 
   /// Package dependencies that were actually discovered
@@ skipping 20 matching lines @@
     }
     var srcSubpackage = subpackageForUri(src);
     if (srcSubpackage == null) return;
     var srcSubpackageRules = subpackageRules[srcSubpackage];
     if (srcSubpackageRules == null) {
       problem('$src is in subpackage "$srcSubpackage", which is not found in '
           'subpackageRules');
       return;
     }
     srcSubpackageRules.actuallyContainsFiles = true;
-    if (dst.pathSegments[0] == 'analyzer') {
-      if (srcSubpackageRules.mayImportAnalyzer) {
-        srcSubpackageRules.actuallyImportsAnalyzer = true;
-      } else {
-        problem('$src depends on $dst, but subpackage "$srcSubpackage" may not '
-            'import analyzer');
-      }
-    }
     var dstSubPackage = subpackageForUri(dst);
     if (dstSubPackage == null) return;
     if (dstSubPackage == srcSubpackage) return;
     if (srcSubpackageRules.allowedDependencies.contains(dstSubPackage)) {
       srcSubpackageRules.actualDependencies.add(dstSubPackage);
     } else {
       problem('$src depends on $dst, but subpackage "$srcSubpackage" is not '
           'allowed to depend on subpackage "$dstSubPackage"');
     }
   }
@@ skipping 40 matching lines @@
     for (var package in allowedPackageDependencies) {
       if (!actualPackageDependencies.contains(package)) {
         problem('$package is listed in allowedPackageDependencies, '
             'but is not used');
       }
     }
     subpackageRules.forEach((subpackage, rule) {
       if (!rule.actuallyContainsFiles) {
         problem("$subpackage contains no files");
       }
-      if (rule.mayImportAnalyzer && !rule.actuallyImportsAnalyzer) {
-        problem("$subpackage is allowed to import analyzer, but doesn't");
-      }
       if (rule.allowSubdirs && !rule.actuallyHasSubdirs) {
         problem("$subpackage is allowed to have subdirectories, but doesn't");
       }
       for (var dep in rule.allowedDependencies
           .toSet()
           .difference(rule.actualDependencies)) {
         problem("$subpackage lists $dep as a dependency, but doesn't use it");
       }
     });
     return problemsReported ? 1 : 0;
@@ skipping 24 matching lines @@
       if (subpackageRules[subpackage].allowSubdirs) {
         subpackageRules[subpackage].actuallyHasSubdirs = true;
       } else {
         problem('Uri $src is in a subfolder of $subpackage, but that '
             'subpackage does not allow dart files in subdirectories.');
       }
     }
     return subpackage;
   }
 }