| 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 c81ce7f8bf067cda88cb79358c1ace8332343ebb..4ce26ae17d3688c44a5fee768c06dacba82fe77c 100644
|
| --- a/pkg/analysis_server/lib/src/context_manager.dart
|
| +++ b/pkg/analysis_server/lib/src/context_manager.dart
|
| @@ -27,6 +27,7 @@ import 'package:analyzer/src/context/source.dart';
|
| import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/java_engine.dart';
|
| import 'package:analyzer/src/generated/java_io.dart';
|
| +import 'package:analyzer/src/generated/sdk.dart';
|
| import 'package:analyzer/src/generated/source.dart';
|
| import 'package:analyzer/src/generated/source_io.dart';
|
| import 'package:analyzer/src/task/options.dart';
|
| @@ -348,10 +349,9 @@ abstract class ContextManagerCallbacks {
|
| void removeContext(Folder folder, List<String> flushedFiles);
|
|
|
| /**
|
| - * Called when the disposition for a context has changed.
|
| + * Called when the package resolution for the given [context] has changed.
|
| */
|
| - void updateContextPackageUriResolver(
|
| - Folder contextFolder, FolderDisposition disposition);
|
| + void updateContextPackageUriResolver(AnalysisContext context);
|
| }
|
|
|
| /**
|
| @@ -390,6 +390,12 @@ class ContextManagerImpl implements ContextManager {
|
| final ResourceProvider resourceProvider;
|
|
|
| /**
|
| + * The manager used to access the SDK that should be associated with a
|
| + * particular context.
|
| + */
|
| + final DartSdkManager sdkManager;
|
| +
|
| + /**
|
| * The context used to work with absolute file system paths.
|
| *
|
| * TODO(scheglov) remove [pathContext].
|
| @@ -488,6 +494,7 @@ class ContextManagerImpl implements ContextManager {
|
|
|
| ContextManagerImpl(
|
| this.resourceProvider,
|
| + this.sdkManager,
|
| this.packageResolverProvider,
|
| this.embeddedUriResolverProvider,
|
| this._packageMapProvider,
|
| @@ -928,7 +935,7 @@ class ContextManagerImpl implements ContextManager {
|
| if (info.isPathToPackageDescription(path)) {
|
| Packages packages = _readPackagespec(packagespec);
|
| if (packages != null) {
|
| - callbacks.updateContextPackageUriResolver(
|
| + _updateContextPackageUriResolver(
|
| folder, new PackagesFileDisposition(packages));
|
| }
|
| }
|
| @@ -1065,6 +1072,7 @@ class ContextManagerImpl implements ContextManager {
|
|
|
| info.setDependencies(dependencies);
|
| info.context = callbacks.addContext(folder, options, disposition);
|
| + folderMap[folder] = info.context;
|
| info.context.name = folder.path;
|
|
|
| processOptionsForContext(info, optionMap);
|
| @@ -1130,6 +1138,41 @@ class ContextManagerImpl implements ContextManager {
|
| }
|
|
|
| /**
|
| + * Set up a [SourceFactory] that resolves packages as appropriate for the
|
| + * given [disposition].
|
| + */
|
| + SourceFactory _createSourceFactory(InternalAnalysisContext context,
|
| + AnalysisOptions options, FolderDisposition disposition, Folder folder) {
|
| + List<UriResolver> resolvers = [];
|
| + List<UriResolver> packageUriResolvers =
|
| + disposition.createPackageUriResolvers(resourceProvider);
|
| +
|
| + EmbedderUriResolver embedderUriResolver;
|
| +
|
| + // First check for a resolver provider.
|
| + if (embeddedUriResolverProvider != null) {
|
| + embedderUriResolver = embeddedUriResolverProvider(folder);
|
| + }
|
| +
|
| + // If no embedded URI resolver was provided, defer to a locator-backed one.
|
| + embedderUriResolver ??=
|
| + new EmbedderUriResolver(context.embedderYamlLocator.embedderYamls);
|
| + if (embedderUriResolver.length == 0) {
|
| + // The embedder uri resolver has no mappings. Use the default Dart SDK
|
| + // uri resolver.
|
| + resolvers.add(new DartUriResolver(sdkManager.getSdkForOptions(options)));
|
| + } else {
|
| + // The embedder uri resolver has mappings, use it instead of the default
|
| + // Dart SDK uri resolver.
|
| + resolvers.add(embedderUriResolver);
|
| + }
|
| +
|
| + resolvers.addAll(packageUriResolvers);
|
| + resolvers.add(new ResourceUriResolver(resourceProvider));
|
| + return new SourceFactory(resolvers, disposition.packages);
|
| + }
|
| +
|
| + /**
|
| * Clean up and destroy the context associated with the given folder.
|
| */
|
| void _destroyContext(ContextInfo info) {
|
| @@ -1499,7 +1542,7 @@ class ContextManagerImpl implements ContextManager {
|
| FolderDisposition disposition = _computeFolderDisposition(
|
| info.folder, dependencies.add, _findPackageSpecFile(info.folder));
|
| info.setDependencies(dependencies);
|
| - callbacks.updateContextPackageUriResolver(info.folder, disposition);
|
| + _updateContextPackageUriResolver(info.folder, disposition);
|
| }
|
|
|
| /**
|
| @@ -1520,6 +1563,14 @@ class ContextManagerImpl implements ContextManager {
|
| return false;
|
| }
|
|
|
| + void _updateContextPackageUriResolver(
|
| + Folder contextFolder, FolderDisposition disposition) {
|
| + AnalysisContext context = folderMap[contextFolder];
|
| + context.sourceFactory = _createSourceFactory(
|
| + context, context.analysisOptions, disposition, contextFolder);
|
| + callbacks.updateContextPackageUriResolver(context);
|
| + }
|
| +
|
| /**
|
| * Create and return a source representing the given [file] within the given
|
| * [context].
|
|
|