fixes #627, update DDC Future.then signature

[email protected]

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

Author: John Messerly

pkg/dev_compiler/lib/runtime/dart_sdk.js

@@ -311,6 +311,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
   let SplayTreeSet = () => (SplayTreeSet = dart.constFn(collection.SplayTreeSet$()))();
   let dynamicAnddynamicTodynamic = () => (dynamicAnddynamicTodynamic = dart.constFn(dart.functionType(dart.dynamic, [dart.dynamic, dart.dynamic])))();
   let MappedIterableOfString$dynamic = () => (MappedIterableOfString$dynamic = dart.constFn(_internal.MappedIterable$(core.String, dart.dynamic)))();
+  let FutureOfString = () => (FutureOfString = dart.constFn(async.Future$(core.String)))();
   let Codec = () => (Codec = dart.constFn(convert.Codec$()))();
   let ComparableOfString = () => (ComparableOfString = dart.constFn(core.Comparable$(core.String)))();
   let List = () => (List = dart.constFn(core.List$()))();
@@ -9345,7 +9346,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
       }
       pipe(streamConsumer) {
         StreamConsumerOfT()._check(streamConsumer);
-        return streamConsumer.addStream(this).then(async.Future)(dart.fn(_ => streamConsumer.close(), dynamicToFuture()));
+        return streamConsumer.addStream(this).then(dart.dynamic)(dart.fn(_ => streamConsumer.close(), dynamicToFuture()));
       }
       transform(S) {
         return streamTransformer => {
@@ -16572,7 +16573,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
         let iterator = input[dartx.iterator];
         return async.Future.doWhile(dart.fn(() => {
           if (!dart.test(iterator.moveNext())) return false;
-          return async.Future.sync(dart.fn(() => dart.dcall(f, iterator.current), VoidTodynamic$())).then(core.bool)(dart.fn(_ => true, dynamicTobool$()));
+          return async.Future.sync(dart.fn(() => dart.dcall(f, iterator.current), VoidTodynamic$())).then(dart.dynamic)(dart.fn(_ => true, dynamicTobool$()));
         }, VoidToObject$()));
       }
       static doWhile(f) {
@@ -17233,7 +17234,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
                   return;
                 }
                 let originalSource = source;
-                listenerValueOrError = completeResult.then(async._Future)(dart.fn(_ => originalSource, dynamicTo_Future()));
+                listenerValueOrError = completeResult.then(dart.dynamic)(dart.fn(_ => originalSource, dynamicTo_Future()));
                 listenerHasError = false;
               }
             }
@@ -26395,10 +26396,10 @@ dart_library.library('dart_sdk', null, /* Imports */[
       super.new();
     }
     decodeStream(byteStream) {
-      return byteStream.transform(core.String)(this.decoder).fold(dart.dynamic)(new core.StringBuffer(), dart.fn((buffer, string) => ((() => {
+      return FutureOfString()._check(byteStream.transform(core.String)(this.decoder).fold(dart.dynamic)(new core.StringBuffer(), dart.fn((buffer, string) => ((() => {
         dart.dsend(buffer, 'write', string);
         return buffer;
-      })()), dynamicAndStringTodynamic())).then(core.String)(dart.fn(buffer => dart.toString(buffer), dynamicToString()));
+      })()), dynamicAndStringTodynamic())).then(dart.dynamic)(dart.fn(buffer => dart.toString(buffer), dynamicToString())));
     }
     static getByName(name) {
       if (name == null) return null;
@@ -33145,7 +33146,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
     static spawn(entryPoint, message, opts) {
       let paused = opts && 'paused' in opts ? opts.paused : false;
       try {
-        return _isolate_helper.IsolateNatives.spawnFunction(entryPoint, message, paused).then(isolate.Isolate)(dart.fn(msg => new isolate.Isolate(isolate.SendPort._check(msg[dartx.get](1)), {pauseCapability: isolate.Capability._check(msg[dartx.get](2)), terminateCapability: isolate.Capability._check(msg[dartx.get](3))}), ListToIsolate()));
+        return FutureOfIsolate()._check(_isolate_helper.IsolateNatives.spawnFunction(entryPoint, message, paused).then(dart.dynamic)(dart.fn(msg => new isolate.Isolate(isolate.SendPort._check(msg[dartx.get](1)), {pauseCapability: isolate.Capability._check(msg[dartx.get](2)), terminateCapability: isolate.Capability._check(msg[dartx.get](3))}), ListToIsolate())));
       } catch (e) {
         let st = dart.stackTrace(e);
         return FutureOfIsolate().error(e, st);
@@ -33166,7 +33167,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
         } else if (args != null) {
           dart.throw(new core.ArgumentError(dart.str`Args must be a list of Strings ${args}`));
         }
-        return _isolate_helper.IsolateNatives.spawnUri(uri, args, message, paused).then(isolate.Isolate)(dart.fn(msg => new isolate.Isolate(isolate.SendPort._check(msg[dartx.get](1)), {pauseCapability: isolate.Capability._check(msg[dartx.get](2)), terminateCapability: isolate.Capability._check(msg[dartx.get](3))}), ListToIsolate()));
+        return FutureOfIsolate()._check(_isolate_helper.IsolateNatives.spawnUri(uri, args, message, paused).then(dart.dynamic)(dart.fn(msg => new isolate.Isolate(isolate.SendPort._check(msg[dartx.get](1)), {pauseCapability: isolate.Capability._check(msg[dartx.get](2)), terminateCapability: isolate.Capability._check(msg[dartx.get](3))}), ListToIsolate())));
       } catch (e) {
         let st = dart.stackTrace(e);
         return FutureOfIsolate().error(e, st);
@@ -54095,7 +54096,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
     static getString(url, opts) {
       let withCredentials = opts && 'withCredentials' in opts ? opts.withCredentials : null;
       let onProgress = opts && 'onProgress' in opts ? opts.onProgress : null;
-      return html$.HttpRequest.request(url, {withCredentials: withCredentials, onProgress: onProgress}).then(core.String)(dart.fn(xhr => xhr[dartx.responseText], HttpRequestToString()));
+      return FutureOfString()._check(html$.HttpRequest.request(url, {withCredentials: withCredentials, onProgress: onProgress}).then(dart.dynamic)(dart.fn(xhr => xhr[dartx.responseText], HttpRequestToString())));
     }
     static postFormData(url, data, opts) {
       let withCredentials = opts && 'withCredentials' in opts ? opts.withCredentials : null;
@@ -54183,7 +54184,7 @@ dart_library.library('dart_sdk', null, /* Imports */[
       let method = opts && 'method' in opts ? opts.method : null;
       let sendData = opts && 'sendData' in opts ? opts.sendData : null;
       if (dart.test(html$.HttpRequest.supportsCrossOrigin)) {
-        return html$.HttpRequest.request(url, {method: method, sendData: sendData}).then(core.String)(dart.fn(xhr => xhr[dartx.responseText], HttpRequestToString()));
+        return FutureOfString()._check(html$.HttpRequest.request(url, {method: method, sendData: sendData}).then(dart.dynamic)(dart.fn(xhr => xhr[dartx.responseText], HttpRequestToString())));
       }
       let completer = CompleterOfString().new();
       if (method == null) {

pkg/dev_compiler/tool/input_sdk/lib/async/future.dart

@@ -432,7 +432,7 @@ abstract class Future<T> {
    * with a `test` parameter, instead of handling both value and error in a
    * single [then] call.
    */
-  Future/*<S>*/ then/*<S>*/(/*=S*/ onValue(T value), { Function onError });
+  Future/*<S>*/ then/*<S>*/(onValue(T value), { Function onError });
 
   /**
    * Handles errors emitted by this [Future].

pkg/dev_compiler/tool/sdk_expected_errors.txt

@@ -97,6 +97,7 @@
 [warning] Unsound implicit cast from dynamic to Stream<S> (dart:convert/chunked_conversion.dart, line 14, col 45)
 [warning] Unsound implicit cast from dynamic to Sink<T> (dart:convert/chunked_conversion.dart, line 16, col 36)
 [warning] Unsound implicit cast from dynamic to List<String> (dart:convert, line 311, col 12)
+[warning] Unsound implicit cast from Future<dynamic> to Future<String> (dart:convert/encoding.dart, line 17, col 12)
 [warning] Unsound implicit cast from dynamic to T (dart:core/expando.dart, line 55, col 12)
 [warning] Unsound implicit cast from dynamic to E (dart:core/list.dart, line 126, col 16)
 [warning] The final variable 'origin' must be initialized (dart:html, line 177, col 3)
@@ -109,6 +110,8 @@
 [warning] The final variables '_attributes', '_childElementCount' and '16' more must be initialized (dart:html, line 13009, col 3)
 [warning] The final variables 'elements', 'form' and '4' more must be initialized (dart:html, line 16625, col 3)
 [warning] The final variable 'length' must be initialized (dart:html, line 17555, col 3)
+[warning] Unsound implicit cast from Future<dynamic> to Future<String> (dart:html, line 19315, col 12)
+[warning] Unsound implicit cast from Future<dynamic> to Future<String> (dart:html, line 19532, col 14)
 [warning] The final variables '_get_contentWindow' and 'sandbox' must be initialized (dart:html, line 20113, col 3)
 [warning] The final variables 'complete', 'currentSrc' and '2' more must be initialized (dart:html, line 20246, col 3)
 [warning] The final variables '_get_valueAsDate', 'entries' and '6' more must be initialized (dart:html, line 20400, col 3)
@@ -139,6 +142,8 @@
 [warning] Unsound implicit cast from dynamic to Rectangle<num> (dart:html, line 37634, col 14)
 [warning] Unsound implicit cast from (T) → void to (Event) → dynamic (dart:html, line 40090, col 67)
 [warning] Unsound implicit cast from (T) → void to (Event) → dynamic (dart:html, line 40112, col 45)
+[warning] Unsound implicit cast from Future<dynamic> to Future<Isolate> (dart:isolate, line 168, col 14)
+[warning] Unsound implicit cast from Future<dynamic> to Future<Isolate> (dart:isolate, line 234, col 14)
 [warning] Unsound implicit cast from num to T (dart:math/rectangle.dart, line 151, col 22)
 [warning] Unsound implicit cast from num to T (dart:math/rectangle.dart, line 152, col 23)
 [warning] Unsound implicit cast from num to T (dart:math/rectangle.dart, line 275, col 10)