MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Maxim Medvedev
2011-05-25 17:18:27 +04:00
parent 166f02d1d9
commit 3adba2fa5d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
+8 -1
View File
@@ -57,6 +57,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgument
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrNamedArgument;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrAssertStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrReturnStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrThrowStatement;
@@ -1240,6 +1241,12 @@ public class PsiUtil {
parent instanceof GrVariable) {
return true;
}
return ControlFlowUtils.collectReturns(ControlFlowUtils.findControlFlowOwner(expr), true).contains(expr);
final GrControlFlowOwner controlFlowOwner = ControlFlowUtils.findControlFlowOwner(expr);
if (controlFlowOwner instanceof GrOpenBlock &&
controlFlowOwner.getParent() instanceof PsiMethod &&
((PsiMethod)controlFlowOwner.getParent()).getReturnType() == PsiType.VOID) {
return false;
}
return ControlFlowUtils.collectReturns(controlFlowOwner, true).contains(expr);
}
}