Chromium Code Reviews| Index: pkg/analysis_server/lib/src/context_manager.dart |
| diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart |
| index 7bce28518867543ab825752d55f1db34a16aec2c..23a87d2b7f5f76cebf38061d9d87a4613fc23d73 100644 |
| --- a/pkg/analysis_server/lib/src/context_manager.dart |
| +++ b/pkg/analysis_server/lib/src/context_manager.dart |
| @@ -15,6 +15,7 @@ import 'package:analyzer/file_system/file_system.dart'; |
| import 'package:analyzer/instrumentation/instrumentation.dart'; |
| import 'package:analyzer/plugin/options.dart'; |
| import 'package:analyzer/source/analysis_options_provider.dart'; |
| +import 'package:analyzer/source/embedder.dart'; |
| import 'package:analyzer/source/package_map_provider.dart'; |
| import 'package:analyzer/source/package_map_resolver.dart'; |
| import 'package:analyzer/source/path_filter.dart'; |
| @@ -1431,6 +1432,20 @@ class PackagesFileDisposition extends FolderDisposition { |
| @override |
| final Packages packages; |
| + Map<String, List<Folder>> buildPackageMap(ResourceProvider resourceProvider) { |
| + Map<String, List<Folder>> packageMap = <String, List<Folder>>{}; |
| + if (packages == null) { |
| + return packageMap; |
| + } |
| + packages.asMap().forEach((String name, Uri uri) { |
| + if (uri.scheme == 'file' || uri.scheme == '' /* unspecified */) { |
| + var path = resourceProvider.pathContext.fromUri(uri); |
| + packageMap[name] = <Folder>[resourceProvider.getFolder(path)]; |
| + } |
| + }); |
| + return packageMap; |
| + } |
| + |
| PackagesFileDisposition(this.packages) {} |
| @override |
| @@ -1441,13 +1456,7 @@ class PackagesFileDisposition extends FolderDisposition { |
| ResourceProvider resourceProvider) { |
| if (packages != null) { |
| // Construct package map for the SdkExtUriResolver. |
| - Map<String, List<Folder>> packageMap = <String, List<Folder>>{}; |
| - packages.asMap().forEach((String name, Uri uri) { |
| - if (uri.scheme == 'file' || uri.scheme == '' /* unspecified */) { |
| - var path = resourceProvider.pathContext.fromUri(uri); |
| - packageMap[name] = <Folder>[resourceProvider.getFolder(path)]; |
| - } |
| - }); |
| + var packageMap = buildPackageMap(resourceProvider); |
|
pquitslund
2015/11/14 00:32:53
Nit: missing type:
Map<String, List<Folder>> pa
Cutch
2015/11/14 00:36:44
Done.
|
| return <UriResolver>[new SdkExtUriResolver(packageMap)]; |
| } else { |
| return const <UriResolver>[]; |