Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: pkg/analysis_server/lib/src/server/driver.dart

Issue 1465983004: Revert "Clean-up the registration of plugins" (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analysis_server/test/analysis_abstract.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
//
« no previous file with comments | « no previous file | pkg/analysis_server/test/analysis_abstract.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698