Paul, I have been working on a patch for debugger stepping issues described in GROOVY-4063, GROOVY-7647, GROOVY-7918 and GROOVY-8742. I am currently testing this patch to StatementWriter. Could you give this a quick try with the core project's tests? Can you see any problems with this approach?
public void writeBlockStatement(BlockStatement block) { writeStatementLabel(block); int mark = controller.getOperandStack().getStackLength(); CompileStack compileStack = controller.getCompileStack(); compileStack.pushVariableScope(block.getVariableScope()); for (Statement statement : block.getStatements()) { statement.visit(controller.getAcg()); } compileStack.pop(); // GRECLIPSE add if (block.getLastLineNumber() > 0) { MethodVisitor mv = controller.getMethodVisitor(); Label blockEnd = new Label(); mv.visitLabel(blockEnd); mv.visitLineNumber(block.getLastLineNumber(), blockEnd); } // GRECLIPSE end controller.getOperandStack().popDownTo(mark); } ________________________________ From: Paul King <pa...@asert.com.au> Sent: Thursday, November 1, 2018 4:22 PM To: dev@groovy.apache.org Subject: Groovy 2.5.4 planning Just a little bit of advance warning. I'm still working on a few bug fixes but I'll aim to prepare a new release next week. If you have any pending changes, please get them in and/or let me know your plans. The release date isn't super urgent if there are other fixes we should be waiting for but I'd like to get the non-beta version of ASM 7 incorporated and a few other important fixes. Cheers, Paul.