Fix errors and warnings

pkg/analyzer/lib/src/cancelable_future.dart

Index: pkg/analyzer/lib/src/cancelable_future.dart
diff --git a/pkg/analyzer/lib/src/cancelable_future.dart b/pkg/analyzer/lib/src/cancelable_future.dart
index 43eb00c10c299b3d0fac32a535653a02758df55d..22ce10d71b272a34bd9dcd6b76fd746676ea7521 100644
--- a/pkg/analyzer/lib/src/cancelable_future.dart
+++ b/pkg/analyzer/lib/src/cancelable_future.dart
@@ -252,7 +252,7 @@ class _CancelableCompleterFuture<T> implements CancelableFuture<T> {
       _completer._outerCompleter.future.catchError(onError, test: test);
 
   @override
-  Future/*<S>*/ then/*<S>*/(onValue(T value), {Function onError}) =>
+  Future/*<S>*/ then/*<S>*/(FutureOr<S> onValue(T value), {Function onError}) =>

[Paul Berry, 2017/02/01 16:49:53]

Needs to be "/*<S>*/" to avoid errors in spec mode.  This is breaking the
analyzer bot.

[Brian Wilkerson, 2017/02/01 17:04:54]

Saw that, thanks. CL is out.

       _completer._outerCompleter.future.then(onValue, onError: onError);
 
   @override
@@ -288,7 +288,7 @@ class _WrappedFuture<T> implements CancelableFuture<T> {
       _future.catchError(onError, test: test);
 
   @override
-  Future/*<S>*/ then/*<S>*/(onValue(T value), {Function onError}) =>
+  Future/*<S>*/ then/*<S>*/(FutureOr<S> onValue(T value), {Function onError}) =>

[Paul Berry, 2017/02/01 16:49:53]

Same here.

       _future.then(onValue, onError: onError);
 
   @override