Revert "Move the linter core to the analyzer package"

This reverts commit 6d9d5f5, which
was causing analysis server unit tests to fail.

TBR=brianwilkerson@google.com

Review URL: https://codereview.chromium.org/2561573003 .

DEPS

@@ -73,7 +73,7 @@ vars = {
   "isolate_tag": "@0.2.3",
   "jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
   "json_rpc_2_tag": "@2.0.2",
-  "linter_rev": "@17870d56361a95831e1ab32c82a0851ffe34c82b",
+  "linter_rev": "@b2d95da1287e27d4dbb9bd199dd2d23d650bd274",
   "logging_tag": "@0.11.3+1",
   "markdown_tag": "@0.11.0",
   "matcher_tag": "@0.12.0+2",

pkg/analysis_server/lib/src/context_manager.dart

@@ -30,13 +30,13 @@ import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
-import 'package:analyzer/src/lint/config.dart';
-import 'package:analyzer/src/lint/linter.dart';
-import 'package:analyzer/src/lint/registry.dart';
 import 'package:analyzer/src/task/options.dart';
 import 'package:analyzer/src/util/absolute_path.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:analyzer/src/util/yaml.dart';
+import 'package:linter/src/config.dart';
+import 'package:linter/src/linter.dart';
+import 'package:linter/src/rules.dart';
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart' as pkgfile show parse;
 import 'package:package_config/src/packages_impl.dart' show MapPackages;
@@ -714,7 +714,7 @@ class ContextManagerImpl implements ContextManager {
     var lintOptions = options['linter'];
     if (lintOptions != null) {
       LintConfig config = new LintConfig.parseMap(lintOptions);
-      Iterable<LintRule> lintRules = Registry.ruleRegistry.enabled(config);
+      Iterable<LintRule> lintRules = ruleRegistry.enabled(config);
       if (lintRules.isNotEmpty) {
         analysisOptions.lint = true;
         analysisOptions.lintRules = lintRules.toList();

pkg/analysis_server/lib/src/server/driver.dart

@@ -26,7 +26,6 @@ import 'package:analyzer/src/generated/incremental_logger.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:args/args.dart';
 import 'package:linter/src/plugin/linter_plugin.dart';
-import 'package:linter/src/rules.dart' as linter;
 import 'package:plugin/manager.dart';
 import 'package:plugin/plugin.dart';
 
@@ -425,7 +424,6 @@ class Driver implements ServerStarter {
     plugins.addAll(_userDefinedPlugins);
     ExtensionManager manager = new ExtensionManager();
     manager.processPlugins(plugins);
-    linter.registerLintRules();
 
     String defaultSdkPath;
     if (results[SDK_OPTION] != null) {

pkg/analysis_server/lib/src/services/linter/linter.dart

@@ -6,7 +6,7 @@ library services.src.linter;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/plugin/options.dart';
-import 'package:analyzer/src/lint/registry.dart';
+import 'package:linter/src/rules.dart';
 import 'package:yaml/yaml.dart';
 
 /**
@@ -38,8 +38,7 @@ class LinterRuleOptionsValidator extends OptionsValidator {
   validateRules(dynamic rules, ErrorReporter reporter) {
     if (rules is YamlList) {
       //TODO(pq): migrate this to a proper API once there is one.
-      Iterable<String> registeredLints =
-          Registry.ruleRegistry.map((r) => r.name);
+      Iterable<String> registeredLints = ruleRegistry.map((r) => r.name);
       rules.nodes.forEach((YamlNode ruleNode) {
         Object value = ruleNode.value;
         if (value != null && !registeredLints.contains(value)) {

pkg/analysis_server/test/analysis/notification_analysis_options_test.dart

@@ -9,7 +9,6 @@ import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/services/lint.dart';
-import 'package:linter/src/rules.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -75,7 +74,6 @@ analyzer:
 
   @override
   void setUp() {
-    registerLintRules();
     super.setUp();
     server.handlers = [new AnalysisDomainHandler(server)];
   }

pkg/analysis_server/test/analysis/notification_errors_test.dart

@@ -10,8 +10,8 @@ import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/lint/linter.dart';
 import 'package:analyzer/src/services/lint.dart';
+import 'package:linter/src/linter.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 

pkg/analysis_server/test/context_manager_test.dart

@@ -22,7 +22,6 @@ import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:linter/src/plugin/linter_plugin.dart';
-import 'package:linter/src/rules.dart';
 import 'package:linter/src/rules/avoid_as.dart';
 import 'package:path/path.dart' as path;
 import 'package:plugin/manager.dart';
@@ -1783,8 +1782,6 @@ abstract class ContextManagerTest {
     plugins.add(linterPlugin);
     ExtensionManager manager = new ExtensionManager();
     manager.processPlugins(plugins);
-
-    registerLintRules();
   }
 
   UriResolver providePackageResolver(Folder folder) => packageResolver;

pkg/analysis_server/test/services/linter/linter_test.dart

@@ -9,7 +9,6 @@ import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/source/analysis_options_provider.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:linter/src/rules.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -30,7 +29,6 @@ class LinterRuleOptionsValidatorTest {
   List<AnalysisError> get errors => recorder.errors;
 
   setUp() {
-    registerLintRules();
     recorder = new RecordingErrorListener();
     reporter = new ErrorReporter(recorder, new _TestSource());
   }