Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Unified Diff: pkg/analysis_server/lib/src/context_manager.dart

Issue 1653733002: Support for embedder dependency changes (#25606). (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: master_merge Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analysis_server/test/context_manager_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 efd0301684742fc234eb481141274444cb604d55..92efe4d056de6d627df71d2b0ddd761babc4bec5 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -23,6 +23,7 @@ import 'package:analyzer/source/path_filter.dart';
import 'package:analyzer/source/pub_package_map_provider.dart';
import 'package:analyzer/source/sdk_ext.dart';
import 'package:analyzer/src/context/context.dart' as context;
+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';
@@ -846,14 +847,57 @@ class ContextManagerImpl implements ContextManager {
String path, ContextInfo info, Folder folder) {
// Check to see if this is the .packages file for this context and if so,
// update the context's source factory.
- if (absolutePathContext.basename(path) == PACKAGE_SPEC_NAME &&
- info.isPathToPackageDescription(path)) {
+ if (absolutePathContext.basename(path) == PACKAGE_SPEC_NAME) {
File packagespec = resourceProvider.getFile(path);
if (packagespec.exists) {
- Packages packages = _readPackagespec(packagespec);
- if (packages != null) {
- callbacks.updateContextPackageUriResolver(
- folder, new PackagesFileDisposition(packages));
+ // Locate embedder yamls for this .packages file.
+ // If any embedder libs are contributed and this context does not
+ // have an embedded URI resolver, we need to create a new context.
+
+ List<int> bytes = packagespec.readAsStringSync().codeUnits;
+ Map<String, Uri> packages =
+ pkgfile.parse(bytes, new Uri.file(packagespec.path));
+
+ Map<String, List<Folder>> packageMap =
+ new PackagesFileDisposition(new MapPackages(packages))
+ .buildPackageMap(resourceProvider);
+ Map<Folder, YamlMap> embedderYamls =
+ new EmbedderYamlLocator(packageMap).embedderYamls;
+
+ SourceFactory sourceFactory = info.context.sourceFactory;
+
+ // Check for library embedders.
+ if (embedderYamls.values.any(definesEmbeddedLibs)) {
+ // If there is no embedded URI resolver, a new source factory needs to
+ // be recreated.
+ if (sourceFactory is SourceFactoryImpl) {
+ if (!sourceFactory.resolvers
+ .any((UriResolver r) => r is EmbedderUriResolver)) {
+
+ // Get all but the dart: Uri resolver.
+ List<UriResolver> resolvers = sourceFactory.resolvers
+ .where((r) => r is! DartUriResolver)
+ .toList();
+ // Add an embedded URI resolver in its place.
+ resolvers.add(new EmbedderUriResolver(embedderYamls));
+
+ // Set a new source factory.
+ SourceFactoryImpl newFactory = sourceFactory.clone();
+ newFactory.resolvers.clear();
+ newFactory.resolvers.addAll(resolvers);
+ info.context.sourceFactory = newFactory;
+ return;
+ }
+ }
+ }
+
+ // Next check for package URI updates.
+ if (info.isPathToPackageDescription(path)) {
+ Packages packages = _readPackagespec(packagespec);
+ if (packages != null) {
+ callbacks.updateContextPackageUriResolver(
+ folder, new PackagesFileDisposition(packages));
+ }
}
}
}
« no previous file with comments | « no previous file | pkg/analysis_server/test/context_manager_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698