[GROOVY-4404] Variable scope of BlockStatement getting lost inside ReturnAdder

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.7.4, 1.8-beta-1
• Fix Version/s: 1.7.5, 1.8-beta-2
• Component/s: class generator
• Assignee: Guillaume Sauthier
• Reporter: Andrew Eisenberg
• Created: 07/Sep/10 23:06
• Updated: 15/Dec/10 22:19
• Resolved: 08/Sep/10 06:21

Description

Inside of of ReturnAdder, there is the code:

BlockStatement newBlock = new BlockStatement();
newBlock.setVariableScope(node.getVariableScope());

This is meant to ensure that the variable scope of the new block statement has the appropriate variable scope. However, node is of type MethodNode. The code block should be as follows:

BlockStatement newBlock = new BlockStatement();
Statement code = node.getCode();
if (code instanceof BlockStatement) {
  newBlock.setVariableScope(((BlockStatement) code).getVariableScope());
}

If code is not of type BlockStatement, then we don't need to set the variable scope.