Index: pkg/code_transformers/lib/src/dart_sdk.dart |
diff --git a/pkg/code_transformers/lib/src/dart_sdk.dart b/pkg/code_transformers/lib/src/dart_sdk.dart |
index 3438218d514ec87f7fc3656f941ace7b4899b71d..e78057ff5da5c84b16af51fea134f4bfb4788b26 100644 |
--- a/pkg/code_transformers/lib/src/dart_sdk.dart |
+++ b/pkg/code_transformers/lib/src/dart_sdk.dart |
@@ -108,10 +108,10 @@ class DartSourceProxy implements UriAnnotatedSource { |
return new DartSourceProxy(source, uri); |
} |
- Source resolveRelative(Uri relativeUri) { |
+ Uri resolveRelative(Uri relativeUri) { |
// Assume that the type can be accessed via this URI, since these |
// should only be parts for dart core files. |
- return wrap(_proxy.resolveRelative(relativeUri), uri); |
+ return _proxy.uri.resolveUri(relativeUri); |
blois
2014/08/05 21:33:26
The DartSourceProxy wraps 'dart:' sources, and I'm
Brian Wilkerson
2014/08/05 21:44:21
That's a bug. It should be resolved to dart:core/a
|
} |
bool exists() => _proxy.exists(); |
@@ -181,6 +181,11 @@ class MockDartSdk implements DartSdk { |
} |
return src; |
} |
+ |
+ @override |
+ Source fromFileUri(Uri uri) { |
+ throw new UnsupportedError('MockDartSdk.fromFileUri'); |
+ } |
} |
class _MockSdkSource implements UriAnnotatedSource { |
@@ -209,6 +214,6 @@ class _MockSdkSource implements UriAnnotatedSource { |
bool get isInSystemLibrary => true; |
- Source resolveRelative(Uri relativeUri) => |
+ Uri resolveRelative(Uri relativeUri) => |
throw new UnsupportedError('not expecting relative urls in dart: mocks'); |
} |