Improve error message for failed Java method lookup, with signature l…

…ist when there are overloads.
jruby · Aug 11, 2011 · 6f68187 · 6f68187
1 parent a9c712e
commit 6f68187
Showing 1 changed file with 34 additions and 10 deletions.
diff --git a/src/org/jruby/java/dispatch/CallableSelector.java b/src/org/jruby/java/dispatch/CallableSelector.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
+import org.jruby.RubyModule;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.java.proxies.ConcreteJavaProxy;
 import org.jruby.javasupport.JavaCallable;
@@ -411,14 +412,13 @@ private static Class argClass(IRubyObject a) {
         return a.getJavaClass();
     }
 
-    public static RaiseException argTypesDoNotMatch(Ruby runtime, IRubyObject receiver, Object[] methods, Object... args) {
-        ArrayList<Class<?>> argTypes = new ArrayList<Class<?>>(args.length);
-
-        for (Object o : args) {
-            argTypes.add(argClassTypeError(o));
+    public static RaiseException argTypesDoNotMatch(Ruby runtime, IRubyObject receiver, JavaCallable[] methods, Object... args) {
+        Class[] argTypes = new Class[args.length];
+        for (int i = 0; i < args.length; i++) {
+            argTypes[0] = argClassTypeError(args[i]);
         }
 
-        return argumentError(runtime.getCurrentContext(), methods[0], receiver, argTypes);
+        return argumentError(runtime.getCurrentContext(), methods, receiver, argTypes);
     }
 
     private static Class argClassTypeError(Object object) {
@@ -432,10 +432,34 @@ private static Class argClassTypeError(Object object) {
         return object.getClass();
     }
 
-    private static RaiseException argumentError(ThreadContext context, Object method, IRubyObject receiver, List<Class<?>> argTypes) {
-        String methodName = (method instanceof JavaConstructor || method instanceof JavaProxyConstructor) ? "constructor" : ((JavaMethod)method).name().toString();
+    private static RaiseException argumentError(ThreadContext context, ParameterTypes[] methods, IRubyObject receiver, Class[] argTypes) {
+        boolean constructor = methods[0] instanceof JavaConstructor || methods[0] instanceof JavaProxyConstructor;
 
-        return context.getRuntime().newNameError("no " + methodName + " with arguments matching " +
-                argTypes + " on object " + receiver.callMethod(context, "inspect"), null);
+        StringBuffer fullError = new StringBuffer();
+        fullError.append("no ");
+        if (constructor) {
+            fullError.append("constructor");
+        } else {
+            fullError.append("method '")
+                    .append(((JavaMethod)methods[0]).name().toString())
+                    .append("' ");
+        }
+        fullError.append("for arguments ")
+                .append(CodegenUtils.prettyParams(argTypes))
+                .append(" on ");
+        if (receiver instanceof RubyModule) {
+            fullError.append(((RubyModule)receiver).getName());
+        } else {
+            fullError.append(receiver.getMetaClass().getRealClass().getName());
+        }
+
+        if (methods.length > 1) {
+            fullError.append("\n  available overloads:");
+            for (ParameterTypes method : methods) {
+                fullError.append("\n    " + CodegenUtils.prettyParams(method.getParameterTypes()));
+            }
+        }
+
+        return context.runtime.newNameError(fullError.toString(), null);
     }
 }