| Index: pkg/analysis_server/lib/src/plugin/server_plugin.dart
|
| diff --git a/pkg/analysis_server/lib/src/plugin/server_plugin.dart b/pkg/analysis_server/lib/src/plugin/server_plugin.dart
|
| index be413c6f72de0a0fa40c7a7d791e11f955b7681f..6139725c78564147d61f13fd0ddee0d8edd9daa3 100644
|
| --- a/pkg/analysis_server/lib/src/plugin/server_plugin.dart
|
| +++ b/pkg/analysis_server/lib/src/plugin/server_plugin.dart
|
| @@ -5,17 +5,20 @@
|
| library analysis_server.src.plugin.server_plugin;
|
|
|
| import 'package:analysis_server/analysis/index/index_core.dart';
|
| +import 'package:analysis_server/analysis/navigation/navigation_core.dart';
|
| import 'package:analysis_server/completion/completion_core.dart';
|
| import 'package:analysis_server/edit/assist/assist_core.dart';
|
| import 'package:analysis_server/edit/fix/fix_core.dart';
|
| import 'package:analysis_server/plugin/analyzed_files.dart';
|
| import 'package:analysis_server/plugin/assist.dart';
|
| import 'package:analysis_server/plugin/fix.dart';
|
| +import 'package:analysis_server/plugin/navigation.dart';
|
| import 'package:analysis_server/src/analysis_server.dart';
|
| import 'package:analysis_server/src/domain_analysis.dart';
|
| import 'package:analysis_server/src/domain_completion.dart';
|
| import 'package:analysis_server/src/domain_execution.dart';
|
| import 'package:analysis_server/src/domain_server.dart';
|
| +import 'package:analysis_server/src/domains/analysis/navigation_dart.dart';
|
| import 'package:analysis_server/src/edit/edit_domain.dart';
|
| import 'package:analysis_server/src/protocol.dart';
|
| import 'package:analysis_server/src/search/search_domain.dart';
|
| @@ -74,6 +77,13 @@ class ServerPlugin implements Plugin {
|
| static const String INDEX_CONTRIBUTOR_EXTENSION_POINT = 'indexContributor';
|
|
|
| /**
|
| + * The simple identifier of the extension point that allows plugins to
|
| + * register navigation contributors.
|
| + */
|
| + static const String NAVIGATION_CONTRIBUTOR_EXTENSION_POINT =
|
| + 'navigationContributor';
|
| +
|
| + /**
|
| * The unique identifier of this plugin.
|
| */
|
| static const String UNIQUE_IDENTIFIER = 'analysis_server.core';
|
| @@ -113,6 +123,11 @@ class ServerPlugin implements Plugin {
|
| ExtensionPoint indexContributorExtensionPoint;
|
|
|
| /**
|
| + * The extension point that allows plugins to register navigation contributors.
|
| + */
|
| + ExtensionPoint navigationContributorExtensionPoint;
|
| +
|
| + /**
|
| * Initialize a newly created plugin.
|
| */
|
| ServerPlugin();
|
| @@ -151,6 +166,13 @@ class ServerPlugin implements Plugin {
|
| List<IndexContributor> get indexContributors =>
|
| indexContributorExtensionPoint.extensions;
|
|
|
| + /**
|
| + * Return a list containing all of the navigation contributors that were
|
| + * contributed.
|
| + */
|
| + List<NavigationContributor> get navigationContributors =>
|
| + navigationContributorExtensionPoint.extensions;
|
| +
|
| @override
|
| String get uniqueIdentifier => UNIQUE_IDENTIFIER;
|
|
|
| @@ -183,6 +205,9 @@ class ServerPlugin implements Plugin {
|
| FIX_CONTRIBUTOR_EXTENSION_POINT, _validateFixContributorExtension);
|
| indexContributorExtensionPoint = registerExtensionPoint(
|
| INDEX_CONTRIBUTOR_EXTENSION_POINT, _validateIndexContributorExtension);
|
| + navigationContributorExtensionPoint = registerExtensionPoint(
|
| + NAVIGATION_CONTRIBUTOR_EXTENSION_POINT,
|
| + _validateNavigationContributorExtension);
|
| }
|
|
|
| @override
|
| @@ -190,7 +215,8 @@ class ServerPlugin implements Plugin {
|
| //
|
| // Register analyze file functions.
|
| //
|
| - registerExtension(ANALYZE_FILE_EXTENSION_POINT_ID,
|
| + registerExtension(
|
| + ANALYZE_FILE_EXTENSION_POINT_ID,
|
| (File file) => AnalysisEngine.isDartFileName(file.path) ||
|
| AnalysisEngine.isHtmlFileName(file.path));
|
| //
|
| @@ -204,6 +230,11 @@ class ServerPlugin implements Plugin {
|
| // TODO(brianwilkerson) Register the completion contributors.
|
| // registerExtension(COMPLETION_CONTRIBUTOR_EXTENSION_POINT_ID, ???);
|
| //
|
| + // Register navigation contributors.
|
| + //
|
| + registerExtension(NAVIGATION_CONTRIBUTOR_EXTENSION_POINT_ID,
|
| + new DartNavigationComputer());
|
| + //
|
| // Register domains.
|
| //
|
| String domainId = Plugin.join(UNIQUE_IDENTIFIER, DOMAIN_EXTENSION_POINT);
|
| @@ -300,4 +331,16 @@ class ServerPlugin implements Plugin {
|
| throw new ExtensionError('Extensions to $id must be an IndexContributor');
|
| }
|
| }
|
| +
|
| + /**
|
| + * Validate the given extension by throwing an [ExtensionError] if it is not a
|
| + * valid navigation contributor.
|
| + */
|
| + void _validateNavigationContributorExtension(Object extension) {
|
| + if (extension is! NavigationContributor) {
|
| + String id = navigationContributorExtensionPoint.uniqueIdentifier;
|
| + throw new ExtensionError(
|
| + 'Extensions to $id must be an NavigationContributor');
|
| + }
|
| + }
|
| }
|
|
|