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

Unified Diff: pkg/analysis_server/test/context_manager_test.dart

Issue 1437893003: Add _embedder.yaml support to analyzer and analysis_server (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month 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
Index: pkg/analysis_server/test/context_manager_test.dart
diff --git a/pkg/analysis_server/test/context_manager_test.dart b/pkg/analysis_server/test/context_manager_test.dart
index 9fad2968c9c5bbf0d432d4c67270774c1cf6ee4b..e11c5dff257d6f4eb2b6c7c8aa42ff8316e3998b 100644
--- a/pkg/analysis_server/test/context_manager_test.dart
+++ b/pkg/analysis_server/test/context_manager_test.dart
@@ -10,6 +10,7 @@ import 'package:analysis_server/src/context_manager.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/file_system/memory_file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
+import 'package:analyzer/source/embedder.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/error.dart';
import 'package:analyzer/src/generated/source.dart';
@@ -567,6 +568,49 @@ analyzer:
});
}
+ test_embedder_packagespec() async {
+ // Create files.
+ String libPath = newFolder([projPath, LIB_NAME]);
+ newFile([libPath, 'main.dart']);
+ newFile([libPath, 'nope.dart']);
+ String sdkExtPath = newFolder([projPath, 'sdk_ext']);
+ newFile([sdkExtPath, 'entry.dart']);
+ String sdkExtSrcPath = newFolder([projPath, 'sdk_ext', 'src']);
+ newFile([sdkExtSrcPath, 'part.dart']);
+ // Setup _embedder.yaml.
+ newFile(
+ [libPath, '_embedder.yaml'],
+ r'''
+embedder_libs:
+ "dart:foobar": "../sdk_ext/entry.dart"
+ "dart:typed_data": "../sdk_ext/src/part"
+ ''');
+ // Setup .packages file
+ newFile(
+ [projPath, '.packages'],
+ r'''
+test_pack:lib/''');
+ // Setup context.
+
+ manager.setRoots(<String>[projPath], <String>[], <String, String>{});
+ await pumpEventQueue();
+ // Confirm that one context was created.
+ var contexts =
+ manager.contextsInAnalysisRoot(resourceProvider.newFolder(projPath));
+ expect(contexts, isNotNull);
+ expect(contexts.length, equals(1));
+ var context = contexts[0];
+ var source = context.sourceFactory.forUri('dart:foobar');
+ expect(source, isNotNull);
+ expect(source.fullName, equals('/my/proj/sdk_ext/entry.dart'));
+ // We can't find dart:core because we didn't list it in our
+ // embedder_libs map.
+ expect(context.sourceFactory.forUri('dart:core'), isNull);
+ // We can find dart:typed_data because we listed it in our
+ // embedder_libs map.
+ expect(context.sourceFactory.forUri('dart:typed_data'), isNotNull);
+ }
+
test_sdk_ext_packagespec() async {
// Create files.
String libPath = newFolder([projPath, LIB_NAME]);
@@ -588,8 +632,7 @@ analyzer:
newFile(
[projPath, '.packages'],
r'''
-test_pack:lib/
-''');
+test_pack:lib/''');
// Setup context.
manager.setRoots(<String>[projPath], <String>[], <String, String>{});
// Confirm that one context was created.
@@ -1898,6 +1941,19 @@ class TestContextManagerCallbacks extends ContextManagerCallbacks {
*/
Iterable<String> get currentContextPaths => currentContextTimestamps.keys;
+ /// If [disposition] has a package map, attempt to locate `_embedder.yaml`
+ /// files.
+ void _locateEmbedderYamls(AnalysisContext context,
+ FolderDisposition disposition) {
+ Map<String, List<Folder>> packageMap;
+ if (disposition is PackageMapDisposition) {
+ packageMap = disposition.packageMap;
+ } else if (disposition is PackagesFileDisposition) {
+ packageMap = disposition.buildPackageMap(resourceProvider);
+ }
+ context.embedderYamlLocator.refresh(packageMap);
+ }
+
@override
AnalysisContext addContext(Folder folder, FolderDisposition disposition) {
String path = folder.path;
@@ -1907,7 +1963,16 @@ class TestContextManagerCallbacks extends ContextManagerCallbacks {
currentContextSources[path] = new HashSet<Source>();
currentContextDispositions[path] = disposition;
currentContext = AnalysisEngine.instance.createAnalysisContext();
+ _locateEmbedderYamls(currentContext, disposition);
List<UriResolver> resolvers = [];
+ EmbedderYamlLocator embedderYamlLocator = currentContext.embedderYamlLocator;
+ EmbedderUriResolver embedderUriResolver =
+ new EmbedderUriResolver(embedderYamlLocator.embedderYamls);
+ if (embedderUriResolver.length > 0) {
+ // We have some embedder dart: uri mappings, add the resolver
+ // to the list.
+ resolvers.add(embedderUriResolver);
+ }
resolvers.addAll(disposition.createPackageUriResolvers(resourceProvider));
resolvers.add(new FileUriResolver());
currentContext.sourceFactory =

Powered by Google App Engine
This is Rietveld 408576698