| Index: packages/analyzer/example/resolver_driver.dart
|
| diff --git a/packages/analyzer/example/resolver_driver.dart b/packages/analyzer/example/resolver_driver.dart
|
| index 59e66e748feaebd05fa4dde92b922f08db3456ae..cf68857d2283749a3975f2b7dc466745a5bf1b1f 100755
|
| --- a/packages/analyzer/example/resolver_driver.dart
|
| +++ b/packages/analyzer/example/resolver_driver.dart
|
| @@ -5,14 +5,19 @@
|
|
|
| import 'dart:io';
|
|
|
| -import 'package:analyzer/src/generated/ast.dart';
|
| -import 'package:analyzer/src/generated/element.dart';
|
| +import 'package:analyzer/dart/ast/ast.dart';
|
| +import 'package:analyzer/dart/ast/visitor.dart';
|
| +import 'package:analyzer/dart/element/element.dart';
|
| +import 'package:analyzer/file_system/file_system.dart' hide File;
|
| +import 'package:analyzer/file_system/physical_file_system.dart';
|
| +import 'package:analyzer/source/package_map_resolver.dart';
|
| +import 'package:analyzer/src/context/builder.dart';
|
| +import 'package:analyzer/src/dart/sdk/sdk.dart';
|
| import 'package:analyzer/src/generated/engine.dart';
|
| -import 'package:analyzer/src/generated/java_io.dart';
|
| import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
|
| -import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
|
| import 'package:analyzer/src/generated/source.dart';
|
| import 'package:analyzer/src/generated/source_io.dart';
|
| +import 'package:analyzer/src/source/source_resource.dart';
|
|
|
| void main(List<String> args) {
|
| print('working dir ${new File('.').resolveSymbolicLinksSync()}');
|
| @@ -27,20 +32,25 @@ void main(List<String> args) {
|
| packageRoot = args[2];
|
| }
|
|
|
| - JavaSystemIO.setProperty("com.google.dart.sdk", args[0]);
|
| - DartSdk sdk = DirectoryBasedDartSdk.defaultSdk;
|
| + PhysicalResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
|
| + DartSdk sdk = new FolderBasedDartSdk(
|
| + resourceProvider, resourceProvider.getFolder(args[0]));
|
|
|
| - var resolvers = [new DartUriResolver(sdk), new FileUriResolver()];
|
| + var resolvers = [
|
| + new DartUriResolver(sdk),
|
| + new ResourceUriResolver(resourceProvider)
|
| + ];
|
|
|
| if (packageRoot != null) {
|
| - var packageDirectory = new JavaFile(packageRoot);
|
| - resolvers.add(new PackageUriResolver([packageDirectory]));
|
| + ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
|
| + resolvers.add(new PackageMapUriResolver(resourceProvider,
|
| + builder.convertPackagesToMap(builder.createPackageMap(packageRoot))));
|
| }
|
|
|
| AnalysisContext context = AnalysisEngine.instance.createAnalysisContext()
|
| ..sourceFactory = new SourceFactory(resolvers);
|
|
|
| - Source source = new FileBasedSource(new JavaFile(args[1]));
|
| + Source source = new FileSource(resourceProvider.getFile(args[1]));
|
| ChangeSet changeSet = new ChangeSet()..addedSource(source);
|
| context.applyChanges(changeSet);
|
| LibraryElement libElement = context.computeLibraryElement(source);
|
| @@ -56,6 +66,7 @@ const _usage =
|
| 'Usage: resolve_driver <path_to_sdk> <file_to_resolve> [<packages_root>]';
|
|
|
| class _ASTVisitor extends GeneralizingAstVisitor {
|
| + @override
|
| visitNode(AstNode node) {
|
| var lines = <String>['${node.runtimeType} : <"$node">'];
|
| if (node is SimpleIdentifier) {
|
|
|