partial fix for #414, nSM message for dcall should show correct target

[email protected]

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

Author: John Messerly

pkg/dev_compiler/lib/runtime/dart/_operations.js

@@ -103,6 +103,7 @@ dart_library.library('dart/_operations', null, /* Imports */[
   }
 
   function checkAndCall(f, ftype, obj, args, name) {
+    let originalFunction = f;
     if (!(f instanceof Function)) {
       // We're not a function (and hence not a method either)
       // Grab the `call` method if it's not a function.
@@ -111,7 +112,7 @@ dart_library.library('dart/_operations', null, /* Imports */[
         f = f.call;
       }
       if (!(f instanceof Function)) {
-        throwNoSuchMethod(obj, name, args);
+        throwNoSuchMethod(obj, name, args, originalFunction);
       }
     }
     // If f is a function, but not a method (no method type)
@@ -133,7 +134,7 @@ dart_library.library('dart/_operations', null, /* Imports */[
 
     // TODO(leafp): throw a type error (rather than NSM)
     // if the arity matches but the types are wrong.
-    throwNoSuchMethod(obj, name, args, f);
+    throwNoSuchMethod(obj, name, args, originalFunction);
   }
 
   function dcall(f, ...args) {

pkg/dev_compiler/test/browser/runtime_tests.js

@@ -24,6 +24,20 @@ suite('generic', () => {
     assert.throws(() => { generic(function(){}); });
   });
 
+  test('dcall noSuchMethod has correct error target', () => {
+    assert.throws(() => dart.dcall(42),
+        new RegExp('NoSuchMethodError.*\nReceiver: 42', 'm'),
+        'Calls with non-function receiver should throw a NoSuchMethodError' +
+        ' with correct target');
+    
+    // TODO(jmesserly): we should show the name "print" in there somewhere.
+    assert.throws(() => dart.dcall(core.print, 1, 2, 3),
+        new RegExp('NoSuchMethodError.*\n' +
+        "Receiver: Instance of '\\(Object\\) -> void'", 'm'),
+        'Calls with incorrect argument types should throw a NoSuchMethodError' +
+        ' with correct target');
+  });
+
   test('can throw number', () => {
     try {
       dart.throw(42);