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

Side by Side Diff: pkg/analyzer_cli/lib/src/driver.dart

Issue 2076743002: Deprecate EmbedderUriResolver (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « pkg/analyzer/lib/source/embedder.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library analyzer_cli.src.driver; 5 library analyzer_cli.src.driver;
6 6
7 import 'dart:async'; 7 import 'dart:async';
8 import 'dart:convert'; 8 import 'dart:convert';
9 import 'dart:io'; 9 import 'dart:io';
10 10
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 } 381 }
382 } 382 }
383 } 383 }
384 384
385 // Now, build our resolver list. 385 // Now, build our resolver list.
386 List<UriResolver> resolvers = []; 386 List<UriResolver> resolvers = [];
387 387
388 // 'dart:' URIs come first. 388 // 'dart:' URIs come first.
389 389
390 // Setup embedding. 390 // Setup embedding.
391 EmbedderUriResolver embedderUriResolver = 391 EmbedderSdk embedderSdk = new EmbedderSdk(embedderMap);
392 new EmbedderUriResolver(embedderMap); 392 if (embedderSdk.libraryMap.size() == 0) {
393 if (embedderUriResolver.length == 0) {
394 // The embedder uri resolver has no mappings. Use the default Dart SDK 393 // The embedder uri resolver has no mappings. Use the default Dart SDK
395 // uri resolver. 394 // uri resolver.
396 resolvers.add(new DartUriResolver(sdk)); 395 resolvers.add(new DartUriResolver(sdk));
397 } else { 396 } else {
398 // The embedder uri resolver has mappings, use it instead of the default 397 // The embedder uri resolver has mappings, use it instead of the default
399 // Dart SDK uri resolver. 398 // Dart SDK uri resolver.
400 resolvers.add(embedderUriResolver); 399 resolvers.add(new DartUriResolver(embedderSdk));
401 } 400 }
402 401
403 // Next SdkExts. 402 // Next SdkExts.
404 if (packageInfo.packageMap != null) { 403 if (packageInfo.packageMap != null) {
405 resolvers.add(new SdkExtUriResolver(packageInfo.packageMap)); 404 resolvers.add(new SdkExtUriResolver(packageInfo.packageMap));
406 } 405 }
407 406
408 // Then package URIs. 407 // Then package URIs.
409 if (packageUriResolver != null) { 408 if (packageUriResolver != null) {
410 resolvers.add(packageUriResolver); 409 resolvers.add(packageUriResolver);
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 for (var package in packages) { 840 for (var package in packages) {
842 var packageName = path.basename(package.path); 841 var packageName = path.basename(package.path);
843 var realPath = package.resolveSymbolicLinksSync(); 842 var realPath = package.resolveSymbolicLinksSync();
844 result[packageName] = [ 843 result[packageName] = [
845 PhysicalResourceProvider.INSTANCE.getFolder(realPath) 844 PhysicalResourceProvider.INSTANCE.getFolder(realPath)
846 ]; 845 ];
847 } 846 }
848 return result; 847 return result;
849 } 848 }
850 } 849 }
OLDNEW
« no previous file with comments | « pkg/analyzer/lib/source/embedder.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698