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

add exception to throws: find functional interface method for method references; discard if in library (IDEA-134468)

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-18 13:16:16 +01:00
parent cd279db9fb
commit 6336e973c9
3 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java
View File

@@ -57,20 +57,10 @@ public class AddExceptionToThrowsFix extends BaseIntentionAction {
PsiDocumentManager.getInstance(project).commitAllDocuments();
PsiElement targetElement = null;
PsiMethod targetMethod = null;
final List<PsiClassType> exceptions = new ArrayList<PsiClassType>();
final PsiMethod targetMethod = collectExceptions(exceptions);
if (targetMethod == null) return;
final PsiElement psiElement = PsiTreeUtil.getParentOfType(myWrongElement, PsiLambdaExpression.class, PsiMethod.class);
if (psiElement instanceof PsiLambdaExpression) {
targetMethod = LambdaUtil.getFunctionalInterfaceMethod(psiElement);
targetElement = ((PsiLambdaExpression)psiElement).getBody();
} else if (psiElement instanceof PsiMethod) {
targetMethod = (PsiMethod)psiElement;
targetElement = targetMethod;
}
List<PsiClassType> exceptions = getUnhandledExceptions(myWrongElement, targetElement, targetMethod);
if (exceptions == null || targetMethod == null) return;
Set<PsiClassType> unhandledExceptions = new THashSet<PsiClassType>(exceptions);
addExceptionsToThrowsList(project, targetMethod, unhandledExceptions);
@@ -180,25 +170,34 @@ public class AddExceptionToThrowsFix extends BaseIntentionAction {
if (!(file instanceof PsiJavaFile)) return false;
if (myWrongElement == null || !myWrongElement.isValid()) return false;
final List<PsiClassType> unhandled = new ArrayList<PsiClassType>();
if (collectExceptions(unhandled) == null) return false;
setText(QuickFixBundle.message("add.exception.to.throws.text", unhandled.size()));
return true;
}
@Nullable
private PsiMethod collectExceptions(List<PsiClassType> unhandled) {
PsiElement targetElement = null;
PsiMethod targetMethod = null;
final PsiElement psiElement = PsiTreeUtil.getParentOfType(myWrongElement, PsiLambdaExpression.class, PsiMethod.class);
if (psiElement instanceof PsiLambdaExpression) {
final PsiElement psiElement = myWrongElement instanceof PsiMethodReferenceExpression ? myWrongElement
: PsiTreeUtil.getParentOfType(myWrongElement, PsiFunctionalExpression.class, PsiMethod.class);
if (psiElement instanceof PsiFunctionalExpression) {
targetMethod = LambdaUtil.getFunctionalInterfaceMethod(psiElement);
targetElement = ((PsiLambdaExpression)psiElement).getBody();
}
targetElement = psiElement instanceof PsiLambdaExpression ? ((PsiLambdaExpression)psiElement).getBody() : psiElement;
}
else if (psiElement instanceof PsiMethod) {
targetMethod = (PsiMethod)psiElement;
targetElement = psiElement;
}
if (targetElement == null || targetMethod == null || !targetMethod.getThrowsList().isPhysical()) return false;
List<PsiClassType> unhandled = getUnhandledExceptions(myWrongElement, targetElement, targetMethod);
if (unhandled == null || unhandled.isEmpty()) return false;
setText(QuickFixBundle.message("add.exception.to.throws.text", unhandled.size()));
return true;
if (targetElement == null || targetMethod == null || !targetMethod.getThrowsList().isPhysical()) return null;
List<PsiClassType> exceptions = getUnhandledExceptions(myWrongElement, targetElement, targetMethod);
if (exceptions == null || exceptions.isEmpty()) return null;
unhandled.addAll(exceptions);
return targetMethod;
}
@Override
@@ -209,11 +208,14 @@ public class AddExceptionToThrowsFix extends BaseIntentionAction {
@Nullable
private static List<PsiClassType> getUnhandledExceptions(@Nullable PsiElement element, PsiElement topElement, PsiMethod targetMethod) {
if (element == null || element == topElement) return null;
if (element == null || element == topElement && !(topElement instanceof PsiMethodReferenceExpression)) return null;
List<PsiClassType> unhandledExceptions = ExceptionUtil.getUnhandledExceptions(element);
if (!filterInProjectExceptions(targetMethod, unhandledExceptions).isEmpty()) {
return unhandledExceptions;
}
if (topElement instanceof PsiMethodReferenceExpression) {
return null;
}
return getUnhandledExceptions(element.getParent(), topElement, targetMethod);
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterMethodReference.java Normal file
View File

@@ -0,0 +1,14 @@
// "Add exception to method signature" "true"
class C {
public static void main(String[] args){
I i = C::foo;
}
class Ex extends Exception {}
static void foo() throws Ex {}
interface I {
void f() throws Ex;
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeMethodReference.java Normal file
View File

@@ -0,0 +1,14 @@
// "Add exception to method signature" "true"
class C {
public static void main(String[] args){
I i = C::f<caret>oo;
}
class Ex extends Exception {}
static void foo() throws Ex {}
interface I {
void f();
}
}