fixes #201, add support for custom URL mapping

[email protected]

Review URL: https://codereview.chromium.org/1150143006

Author: John Messerly

pkg/dev_compiler/lib/src/analysis_context.dart

@@ -34,7 +34,11 @@ AnalysisContext createAnalysisContext(CompilerOptions options,
       ? createMockSdkResolver(mockSdkSources)
       : createSdkPathResolver(options.dartSdkPath);
 
-  var resolvers = [sdkResolver];
+  var resolvers = [];
+  if (options.customUrlMappings.isNotEmpty) {
+    resolvers.add(new CustomUriResolver(options.customUrlMappings));
+  }
+  resolvers.add(sdkResolver);
   if (options.useImplicitHtml) {
     resolvers.add(_createImplicitEntryResolver(options));
   }

pkg/dev_compiler/lib/src/dependency_graph.dart

@@ -301,9 +301,6 @@ class DartSourceNode extends SourceNode {
             : uri.resolve(directiveUri.stringValue);
         var target =
             ParseDartTask.resolveDirective(graph._context, _source, d, null);
-        if (target != null) {
-          if (targetUri != target.uri) print(">> ${target.uri} $targetUri");
-        }
         var node = graph.nodes.putIfAbsent(
             targetUri, () => new DartSourceNode(graph, targetUri, target));
         //var node = graph.nodeFromUri(targetUri);

pkg/dev_compiler/lib/src/options.dart

@@ -236,6 +236,9 @@ class CompilerOptions implements RulesOptions, ResolverOptions, JSCodeOptions {
   /// package (if we can infer where that is located).
   final String runtimeDir;
 
+  /// Custom URI mappings, such as "dart:foo" -> "path/to/foo.dart"
+  final Map<String, String> customUrlMappings;
+
   CompilerOptions({this.allowConstCasts: true, this.checkSdk: false,
       this.dumpInfo: false, this.dumpInfoFile, this.dumpSrcDir,
       this.forceCompile: false, this.formatOutput: false,
@@ -254,12 +257,14 @@ class CompilerOptions implements RulesOptions, ResolverOptions, JSCodeOptions {
       this.emitSourceMaps: true, this.entryPointFile: null,
       this.serverMode: false, this.useImplicitHtml: false,
       this.enableHashing: false, this.host: 'localhost', this.port: 8080,
-      this.runtimeDir});
+      this.runtimeDir, this.customUrlMappings: const {}});
 }
 
 /// Parses options from the command-line
 CompilerOptions parseOptions(List<String> argv) {
   ArgResults args = argParser.parse(argv);
+  bool showUsage = args['help'];
+
   var serverMode = args['server'];
   var enableHashing = args['hashing'];
   if (enableHashing == null) {
@@ -289,6 +294,16 @@ CompilerOptions parseOptions(List<String> argv) {
   var dumpInfo = args['dump-info'];
   if (dumpInfo == null) dumpInfo = serverMode;
 
+  var customUrlMappings = <String, String>{};
+  for (var mapping in args['url-mapping']) {
+    var splitMapping = mapping.split(',');
+    if (splitMapping.length != 2) {
+      showUsage = true;
+      continue;
+    }
+    customUrlMappings[splitMapping[0]] = splitMapping[1];
+  }
+
   var entryPointFile = args.rest.length == 0 ? null : args.rest.first;
 
   return new CompilerOptions(
@@ -306,6 +321,7 @@ CompilerOptions parseOptions(List<String> argv) {
       covariantGenerics: args['covariant-generics'],
       relaxedCasts: args['relaxed-casts'],
       useColors: useColors,
+      customUrlMappings: customUrlMappings,
       useMultiPackage: args['use-multi-package'],
       packageRoot: args['package-root'],
       packagePaths: args['package-paths'].split(','),
@@ -319,7 +335,7 @@ CompilerOptions parseOptions(List<String> argv) {
       onlyInferConstsAndFinalFields: args['infer-only-finals'],
       nonnullableTypes: optionsToList(args['nonnullable'],
           defaultValue: TypeOptions.NONNULLABLE_TYPES),
-      help: args['help'],
+      help: showUsage,
       useMockSdk: args['mock-sdk'],
       dartSdkPath: sdkPath,
       logLevel: logLevel,
@@ -380,6 +396,11 @@ final ArgParser argParser = new ArgParser()
       abbr: 'p',
       help: 'Package root to resolve "package:" imports',
       defaultsTo: 'packages/')
+  ..addOption('url-mapping',
+      help: '--url-mapping=libraryUri,/path/to/library.dart uses library.dart\n'
+      'as the source for an import of of "libraryUri".',
+      allowMultiple: true,
+      splitCommas: false)
   ..addFlag('use-multi-package',
       help: 'Whether to use the multi-package resolver for "package:" imports',
       defaultsTo: false)

pkg/dev_compiler/lib/src/testing.dart

@@ -47,7 +47,7 @@ import 'utils.dart';
 ///     });
 ///
 CheckerResults testChecker(Map<String, String> testFiles,
-    {bool allowConstCasts: true, String sdkDir,
+    {bool allowConstCasts: true, String sdkDir, customUrlMappings: const {},
     CheckerReporter createReporter(AnalysisContext context),
     covariantGenerics: true, relaxedCasts: true,
     inferDownwards: RulesOptions.inferDownwardsDefault,
@@ -73,7 +73,8 @@ CheckerResults testChecker(Map<String, String> testFiles,
       useMockSdk: sdkDir == null,
       dartSdkPath: sdkDir,
       runtimeDir: '/dev_compiler_runtime/',
-      entryPointFile: '/main.dart');
+      entryPointFile: '/main.dart',
+      customUrlMappings: customUrlMappings);
 
   var context = createAnalysisContext(options, fileResolvers: [uriResolver]);
 

pkg/dev_compiler/pubspec.yaml

@@ -7,7 +7,7 @@ author: Dart Dev Compiler team <[email protected]>
 homepage: https://github.com/dart-lang/dev_compiler
 dependencies:
   analyzer: ^0.25.0
-  args: ">=0.12.1 <0.14.0"
+  args: ^0.13.0
   cli_util: ^0.0.1
   crypto: ^0.9.0
   html: ^0.12.0

pkg/dev_compiler/test/checker/checker_test.dart

@@ -8,6 +8,7 @@ library dev_compiler.test.checker_test;
 import 'package:test/test.dart';
 
 import 'package:dev_compiler/src/testing.dart';
+import '../test_util.dart' show testDirectory;
 
 void main() {
   test('ternary operator', () {
@@ -2915,7 +2916,7 @@ void main() {
 
           int foo(int x) => x;
           int bar(int x, int y) => x + y;
-          
+
           void main() {
             bool b;
             b = /*severe:InvalidRuntimeCheckError*/foo is I2I;
@@ -2951,4 +2952,15 @@ void main() {
       '''
     });
   });
+
+  test('custom URL mappings', () => testChecker({
+    '/main.dart': '''
+      import 'dart:foobar' show Baz;
+      main() {
+        print(Baz.quux);
+      }'''
+  },
+      customUrlMappings: {
+    'dart:foobar': '$testDirectory/checker/dart_foobar.dart'
+  }));
 }

pkg/dev_compiler/test/checker/dart_foobar.dart

@@ -0,0 +1,12 @@
+// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+/// This is a test for --url-mapping option.
+/// Analyzer's CustomUriResolver only supports on-disk resources, so we make
+/// this file accessible.
+library dart.foobar;
+
+class Baz {
+  static String quux = "hello world";
+}