| 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 0c1f9db9b211212cad128edd53ce3e125f011bf7..7604fc02431b66f2e6db307f472d7b5192028233 100644
|
| --- a/pkg/analysis_server/lib/src/server/driver.dart
|
| +++ b/pkg/analysis_server/lib/src/server/driver.dart
|
| @@ -14,6 +14,7 @@ import 'package:analysis_server/src/server/http_server.dart';
|
| import 'package:analysis_server/src/server/stdio_server.dart';
|
| import 'package:analysis_server/src/socket_server.dart';
|
| import 'package:analysis_server/starter.dart';
|
| +import 'package:analysis_server/uri/resolver_provider.dart';
|
| import 'package:analyzer/file_system/physical_file_system.dart';
|
| import 'package:analyzer/instrumentation/file_instrumentation.dart';
|
| import 'package:analyzer/instrumentation/instrumentation.dart';
|
| @@ -283,6 +284,12 @@ class Driver implements ServerStarter {
|
| InstrumentationServer instrumentationServer;
|
|
|
| /**
|
| + * The package resolver provider used to override the way package URI's are
|
| + * resolved in some contexts.
|
| + */
|
| + ResolverProvider packageResolverProvider;
|
| +
|
| + /**
|
| * The plugins that are defined outside the analysis_server package.
|
| */
|
| List<Plugin> _userDefinedPlugins = <Plugin>[];
|
| @@ -388,8 +395,8 @@ class Driver implements ServerStarter {
|
| //
|
| // Create the sockets and start listening for requests.
|
| //
|
| - socketServer = new SocketServer(
|
| - analysisServerOptions, defaultSdk, service, serverPlugin);
|
| + socketServer = new SocketServer(analysisServerOptions, defaultSdk, service,
|
| + serverPlugin, packageResolverProvider);
|
| httpServer = new HttpAnalysisServer(socketServer);
|
| stdioServer = new StdioAnalysisServer(socketServer);
|
| socketServer.userDefinedPlugins = _userDefinedPlugins;
|
|
|