MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-26994

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-04-18 17:06:14 +04:00
parent 5e3e99fd63
commit 5a06b76548
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java
+8 -6
View File
@@ -181,9 +181,15 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle
try {
final ConvertReturnStatementsVisitor visitor = new ConvertReturnStatementsVisitor(factory, method, myTargetType);
final ControlFlow controlFlow = HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(method.getBody());
ControlFlow controlFlow;
try {
controlFlow = HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(method.getBody());
}
catch (AnalysisCanceledException e) {
controlFlow = null; //must be an error
}
PsiReturnStatement returnStatement;
if (ControlFlowUtil.processReturns(controlFlow, visitor)) {
if (controlFlow != null && ControlFlowUtil.processReturns(controlFlow, visitor)) {
// extra return statement not needed
// get latest modified return statement and select...
returnStatement = visitor.getLatestReturn();
@@ -193,10 +199,6 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle
}
mySelector.accept(returnStatement, method);
}
catch (AnalysisCanceledException e) {
LOG.error(e);
return;
}
catch (IncorrectOperationException e) {
LOG.error(e);
}