| 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 7db68b655d58f914a9405729342ace8d20036feb..6228efbd5cdc4e350e265b2c5cab8454c4f08db5 100644
|
| --- a/pkg/analysis_server/lib/src/server/driver.dart
|
| +++ b/pkg/analysis_server/lib/src/server/driver.dart
|
| @@ -375,6 +375,22 @@ class Driver implements ServerStarter {
|
|
|
| _initIncrementalLogger(results[INCREMENTAL_RESOLUTION_LOG]);
|
|
|
| + //
|
| + // Process all of the plugins so that extensions are registered.
|
| + //
|
| + ServerPlugin serverPlugin = new ServerPlugin();
|
| + List<Plugin> plugins = <Plugin>[];
|
| + plugins.addAll(AnalysisEngine.instance.requiredPlugins);
|
| + plugins.add(AnalysisEngine.instance.commandLinePlugin);
|
| + plugins.add(AnalysisEngine.instance.optionsPlugin);
|
| + plugins.add(serverPlugin);
|
| + plugins.add(linterPlugin);
|
| + plugins.add(linterServerPlugin);
|
| + plugins.add(dartCompletionPlugin);
|
| + plugins.addAll(_userDefinedPlugins);
|
| + ExtensionManager manager = new ExtensionManager();
|
| + manager.processPlugins(plugins);
|
| +
|
| JavaFile defaultSdkDirectory;
|
| if (results[SDK_OPTION] != null) {
|
| defaultSdkDirectory = new JavaFile(results[SDK_OPTION]);
|
| @@ -408,22 +424,6 @@ class Driver implements ServerStarter {
|
| results[CLIENT_VERSION], AnalysisServer.VERSION, defaultSdk.sdkVersion);
|
| AnalysisEngine.instance.instrumentationService = service;
|
| //
|
| - // Process all of the plugins so that extensions are registered.
|
| - //
|
| - ServerPlugin serverPlugin = new ServerPlugin();
|
| - List<Plugin> plugins = <Plugin>[];
|
| - plugins.addAll(AnalysisEngine.instance.requiredPlugins);
|
| - plugins.add(AnalysisEngine.instance.commandLinePlugin);
|
| - plugins.add(AnalysisEngine.instance.optionsPlugin);
|
| - plugins.add(serverPlugin);
|
| - plugins.add(linterPlugin);
|
| - plugins.add(linterServerPlugin);
|
| - plugins.add(dartCompletionPlugin);
|
| - plugins.addAll(_userDefinedPlugins);
|
| -
|
| - ExtensionManager manager = new ExtensionManager();
|
| - manager.processPlugins(plugins);
|
| - //
|
| // Create the sockets and start listening for requests.
|
| //
|
| socketServer = new SocketServer(
|
|
|