fix #41, named arguments with conversions

[email protected]

Review URL: https://chromereviews.googleplex.com/150407013

Author: John Messerly

lib/src/checker/checker.dart

@@ -396,11 +396,21 @@ class CodeChecker extends RecursiveAstVisitor {
       }
       DartType expectedType = _rules.elementType(element);
       if (expectedType == null) expectedType = _rules.provider.dynamicType;
-      list[i] = checkAssignment(arg, expectedType);
+      list[i] = checkArgument(arg, expectedType);
     }
     return true;
   }
 
+  Expression checkArgument(Expression arg, DartType expectedType) {
+    // Preserve named argument structure, so their immediate parent is the
+    // method invocation.
+    if (arg is NamedExpression) {
+      arg.expression = checkAssignment(arg.expression, expectedType);
+      return arg;
+    }
+    return checkAssignment(arg, expectedType);
+  }
+
   void checkFunctionApplication(
       Expression node, Expression f, ArgumentList list) {
     if (_rules.isDynamicCall(f)) {

test/codegen/expect/async/async.js

@@ -1351,7 +1351,7 @@ var async;
             } else {
               controller.add(newValue);
             }
-          }).bind(this), dart.as(onError: addError, core.Function), {onDone: controller.close});
+          }).bind(this), {onError: dart.as(addError, core.Function), onDone: controller.close});
         }
         if (this.isBroadcast) {
           controller = new StreamController.broadcast({onListen: onListen, onCancel: (() => {
@@ -1389,7 +1389,7 @@ var async;
               subscription.pause();
               controller.addStream(newStream).whenComplete(subscription.resume);
             }
-          }).bind(this), dart.as(onError: eventSink._addError, core.Function), {onDone: controller.close});
+          }).bind(this), {onError: dart.as(eventSink._addError, core.Function), onDone: controller.close});
         }
         if (this.isBroadcast) {
           controller = new StreamController.broadcast({onListen: onListen, onCancel: (() => {
@@ -2335,7 +2335,7 @@ var async;
     class _AddStreamState {
       constructor(controller, source, cancelOnError) {
         this.addStreamFuture = new _Future();
-        this.addSubscription = source.listen(dart.as(controller._add, /* Unimplemented type (dynamic) → void */), dart.as(onError: cancelOnError ? makeErrorHandler(controller) : controller._addError, core.Function), {onDone: controller._close, cancelOnError: cancelOnError});
+        this.addSubscription = source.listen(dart.as(controller._add, /* Unimplemented type (dynamic) → void */), {onError: dart.as(cancelOnError ? makeErrorHandler(controller) : controller._addError, core.Function), onDone: controller._close, cancelOnError: cancelOnError});
       }
       static makeErrorHandler(controller) { return ((e, s) => {
         controller._addError(e, s);

test/dart_codegen/expect/dart.async/stream.dart

@@ -123,7 +123,7 @@ abstract class Stream<T> {
         }
       },
           onError: DDC$RT.cast(addError, dynamic, Function, "CastGeneral",
-              """line 338, column 11 of dart:async/stream.dart: """,
+              """line 338, column 20 of dart:async/stream.dart: """,
               addError is Function, true),
           onDone: controller.close);
     }
@@ -165,7 +165,7 @@ abstract class Stream<T> {
       },
           onError: DDC$RT.cast(eventSink._addError, dynamic, Function,
               "CastGeneral",
-              """line 395, column 11 of dart:async/stream.dart: """,
+              """line 395, column 20 of dart:async/stream.dart: """,
               eventSink._addError is Function, true),
           onDone: controller.close);
     }

test/dart_codegen/expect/dart.async/stream_controller.dart

@@ -421,7 +421,7 @@ class _AddStreamState<T> {
                 controller._add is __t100),
             onError: ((__x104) => DDC$RT.cast(__x104, dynamic, Function,
                     "CastGeneral",
-                    """line 746, column 41 of dart:async/stream_controller.dart: """,
+                    """line 746, column 50 of dart:async/stream_controller.dart: """,
                     __x104 is Function, true))(cancelOnError
                 ? makeErrorHandler(controller)
                 : controller._addError),