| Index: pkg/analysis_server/lib/src/server/driver.dart
|
| diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart
|
| index 5e71c6dcd2de83ad8e52aa762a233715d783216c..1238a1c462cb5795c510623e2dc3a297897db557 100644
|
| --- a/pkg/analysis_server/lib/src/server/driver.dart
|
| +++ b/pkg/analysis_server/lib/src/server/driver.dart
|
| @@ -26,7 +26,6 @@ import 'package:analyzer/src/generated/sdk.dart';
|
| import 'package:analyzer/src/generated/sdk_io.dart';
|
| import 'package:args/args.dart';
|
| import 'package:linter/src/plugin/linter_plugin.dart';
|
| -import 'package:plugin/manager.dart';
|
| import 'package:plugin/plugin.dart';
|
|
|
| /**
|
| @@ -406,14 +405,16 @@ class Driver implements ServerStarter {
|
| //
|
| ServerPlugin serverPlugin = new ServerPlugin();
|
| List<Plugin> plugins = <Plugin>[];
|
| - plugins.addAll(AnalysisEngine.instance.supportedPlugins);
|
| plugins.add(serverPlugin);
|
| + plugins.addAll(_userDefinedPlugins);
|
| plugins.add(linterPlugin);
|
| plugins.add(linterServerPlugin);
|
| - plugins.addAll(_userDefinedPlugins);
|
|
|
| - ExtensionManager manager = new ExtensionManager();
|
| - manager.processPlugins(plugins);
|
| + // Defer to the extension manager in AE for plugin registration.
|
| + AnalysisEngine.instance.userDefinedPlugins = plugins;
|
| + // Force registration.
|
| + AnalysisEngine.instance.taskManager;
|
| +
|
| //
|
| // Create the sockets and start listening for requests.
|
| //
|
|
|