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 767875ba42fafd915ecd96970444a459b825f228..34d996fc192e2334c5b2eb7b5907a5054a818391 100644 |
--- a/pkg/analysis_server/lib/src/context_manager.dart |
+++ b/pkg/analysis_server/lib/src/context_manager.dart |
@@ -15,7 +15,6 @@ 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'; |
@@ -1454,6 +1453,11 @@ class PackagesFileDisposition extends FolderDisposition { |
@override |
final Packages packages; |
+ PackagesFileDisposition(this.packages) {} |
+ |
+ @override |
+ String get packageRoot => null; |
+ |
Map<String, List<Folder>> buildPackageMap(ResourceProvider resourceProvider) { |
Map<String, List<Folder>> packageMap = <String, List<Folder>>{}; |
if (packages == null) { |
@@ -1468,18 +1472,12 @@ class PackagesFileDisposition extends FolderDisposition { |
return packageMap; |
} |
- PackagesFileDisposition(this.packages) {} |
- |
- @override |
- String get packageRoot => null; |
- |
@override |
Iterable<UriResolver> createPackageUriResolvers( |
ResourceProvider resourceProvider) { |
if (packages != null) { |
// Construct package map for the SdkExtUriResolver. |
- Map<String, List<Folder>> packageMap = |
- buildPackageMap(resourceProvider); |
+ Map<String, List<Folder>> packageMap = buildPackageMap(resourceProvider); |
return <UriResolver>[new SdkExtUriResolver(packageMap)]; |
} else { |
return const <UriResolver>[]; |