Fix for Dart 2 runtime + 2.0.0-dev.61.0 (#91)
diff --git a/packages/file/CHANGELOG.md b/packages/file/CHANGELOG.md
index eff9a71..eb7ddab 100644
--- a/packages/file/CHANGELOG.md
+++ b/packages/file/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### dev
+
+* Fix usage within Dart 2 runtime mode in Dart 2.0.0-dev.61.0 and later.
+
#### 5.0.1
* Remove upper case constants
diff --git a/packages/file/lib/src/backends/record_replay/recording_proxy_mixin.dart b/packages/file/lib/src/backends/record_replay/recording_proxy_mixin.dart
index d01ac7b..b95d5ed 100644
--- a/packages/file/lib/src/backends/record_replay/recording_proxy_mixin.dart
+++ b/packages/file/lib/src/backends/record_replay/recording_proxy_mixin.dart
@@ -90,6 +90,12 @@
@protected
Stopwatch get stopwatch;
+ // This check is used in noSuchMethod to detect if this code is running in a
+ // Dart 1 runtime, or Dart 2.
+ // TODO(srawlins): Remove this after the minimum SDK constraint is such that
+ // there is no "Dart 1" runtime mode. 2.0.0 or something.
+ bool get _runningDart1Runtime => <dynamic>[] is List<String>;
+
/// Handles invocations for which there is no concrete implementation
/// function.
///
@@ -142,7 +148,7 @@
// We have to instantiate the correct type of StreamReference or
// FutureReference, so that types are not lost when we unwrap the references
// afterward.
- if (value is Stream<dynamic>) {
+ if (_runningDart1Runtime && value is Stream<dynamic>) {
// This one is here for Dart 1 runtime mode.
value = new StreamReference<dynamic>(value);
} else if (value is Stream<FileSystemEntity>) {
@@ -152,7 +158,7 @@
} else if (value is Stream) {
throw new UnimplementedError(
'Cannot record method with return type ${value.runtimeType}');
- } else if (value is Future<dynamic>) {
+ } else if (_runningDart1Runtime && value is Future<dynamic>) {
// This one is here for Dart 1 runtime mode.
value = new FutureReference<dynamic>(value);
} else if (value is Future<bool>) {
