Chromium Code Reviews| Index: pkg/analysis_server/lib/src/analysis_server.dart |
| diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart |
| index 6d8be8a38557f97449360be10b12b59bdfd1e46b..404d6442459df1498e5971ab8bfde29176da1ee8 100644 |
| --- a/pkg/analysis_server/lib/src/analysis_server.dart |
| +++ b/pkg/analysis_server/lib/src/analysis_server.dart |
| @@ -18,6 +18,7 @@ import 'package:analysis_server/src/operation/operation_analysis.dart'; |
| import 'package:analysis_server/src/operation/operation_queue.dart'; |
| import 'package:analysis_server/src/plugin/server_plugin.dart'; |
| import 'package:analysis_server/src/protocol.dart' hide Element; |
| +import 'package:analysis_server/src/sdk_ext.dart'; |
| import 'package:analysis_server/src/services/correction/namespace.dart'; |
| import 'package:analysis_server/src/services/index/index.dart'; |
| import 'package:analysis_server/src/services/search/search_engine.dart'; |
| @@ -25,6 +26,7 @@ import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.d |
| import 'package:analysis_server/uri/resolver_provider.dart'; |
| import 'package:analyzer/file_system/file_system.dart'; |
| import 'package:analyzer/instrumentation/instrumentation.dart'; |
| +import 'package:analyzer/source/package_map_resolver.dart'; |
| import 'package:analyzer/src/generated/ast.dart'; |
| import 'package:analyzer/src/generated/element.dart'; |
| import 'package:analyzer/src/generated/engine.dart'; |
| @@ -1429,9 +1431,19 @@ class ServerContextManager extends ContextManager { |
| SourceFactory _createSourceFactory(UriResolver packageUriResolver) { |
| UriResolver dartResolver = new DartUriResolver(analysisServer.defaultSdk); |
| UriResolver resourceResolver = new ResourceUriResolver(resourceProvider); |
| + Map<String, List<Folder>> packageMap; |
| + if (packageUriResolver is PackageMapUriResolver) { |
| + packageMap = packageUriResolver.packageMap; |
| + } |
| + UriResolver sdkExtResolver = new SdkExtUriResolver(packageMap); |
| List<UriResolver> resolvers = packageUriResolver != null |
| - ? <UriResolver>[dartResolver, packageUriResolver, resourceResolver] |
| - : <UriResolver>[dartResolver, resourceResolver]; |
| + ? <UriResolver>[dartResolver, |
| + sdkExtResolver, |
| + packageUriResolver, |
| + resourceResolver] |
| + : <UriResolver>[dartResolver, |
| + sdkExtResolver, |
|
Brian Wilkerson
2015/07/07 22:10:18
If the packageUriResolver is null, then packageMap
Cutch
2015/07/08 14:18:17
Done.
|
| + resourceResolver]; |
| return new SourceFactory(resolvers); |
| } |
| } |