method.to_proc was providing 1-indexed line and not 0-indexed

jruby · May 12, 2015 · 2774d78 · 2774d78
1 parent 04635bf
commit 2774d78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -197,7 +197,9 @@ public IRubyObject to_proc(ThreadContext context) {
             argsDesc = Helpers.methodToArgumentDescriptors(method);
         }
 
-        body = new MethodBlockBody(runtime.getStaticScopeFactory().getDummyScope(), signature, method, argsDesc, receiver, originModule, originName, getFilename(), getLine());
+        int line = getLine(); // getLine adds 1 to 1-index but we need to reset to 0-index internally
+        body = new MethodBlockBody(runtime.getStaticScopeFactory().getDummyScope(), signature, method, argsDesc,
+                receiver, originModule, originName, getFilename(), line == -1 ? -1 : line - 1);
         Block b = MethodBlockBody.createMethodBlock(body);
 
         return RubyProc.newProc(runtime, b, Block.Type.LAMBDA);

diff --git a/spec/tags/ruby/core/proc/source_location_tags.txt b/spec/tags/ruby/core/proc/source_location_tags.txt