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

Surround with try/catch fix made aware of try-with-resources

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-01 20:34:18 +01:00
parent 77f94dbece
commit 618e0e3ac0
5 changed files with 77 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java
+11 -3
View File
@@ -284,16 +284,24 @@ public class ExceptionUtil {
@NotNull
public static List<PsiClassType> getUnhandledExceptions(PsiElement[] elements) {
final List<PsiClassType> array = new ArrayList<PsiClassType>();
PsiElementVisitor visitor = new JavaRecursiveElementWalkingVisitor() {
@Override public void visitCallExpression(PsiCallExpression expression) {
final PsiElementVisitor visitor = new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitCallExpression(PsiCallExpression expression) {
addExceptions(array, getUnhandledExceptions(expression, null));
visitElement(expression);
}
@Override public void visitThrowStatement(PsiThrowStatement statement) {
@Override
public void visitThrowStatement(PsiThrowStatement statement) {
addException(array, getUnhandledException(statement, null));
visitElement(statement);
}
@Override
public void visitResourceVariable(PsiResourceVariable resourceVariable) {
addExceptions(array, getUnhandledCloserExceptions(resourceVariable, null));
visitElement(resourceVariable);
}
};
for (PsiElement element : elements) {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java
+9 -15
View File
@@ -13,15 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Created by IntelliJ IDEA.
* User: mike
* Date: Aug 19, 2002
* Time: 8:28:43 PM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.QuickFixBundle;
@@ -40,8 +31,13 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
/**
* @author mike
* Date: Aug 19, 2002
*/
public class SurroundWithTryCatchFix implements IntentionAction {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.SurroundWithTryCatchFix");
private PsiStatement myStatement;
public SurroundWithTryCatchFix(PsiElement element) {
@@ -59,11 +55,10 @@ public class SurroundWithTryCatchFix implements IntentionAction {
}
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
if (myStatement == null || !myStatement.isValid()) {
return false;
}
return !(myStatement instanceof PsiExpressionStatement) ||
!HighlightUtil.isSuperOrThisMethodCall(((PsiExpressionStatement)myStatement).getExpression());
return myStatement != null &&
myStatement.isValid() &&
(!(myStatement instanceof PsiExpressionStatement) ||
!HighlightUtil.isSuperOrThisMethodCall(((PsiExpressionStatement)myStatement).getExpression()));
}
public void invoke(@NotNull Project project, Editor editor, PsiFile file) {
@@ -101,5 +96,4 @@ public class SurroundWithTryCatchFix implements IntentionAction {
public boolean startInWriteAction() {
return true;
}
}