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

CreateTypeParameterFromUsageFix: stop searching variants when inside enum

Browse Source
This commit is contained in:
Roman.Ivanov
2018-09-12 10:54:42 +07:00
parent dd8fcf9cb4
commit 824da44572
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateTypeParameterFromUsageFix.java
+6 -1
View File
@@ -185,7 +185,8 @@ public class CreateTypeParameterFromUsageFix extends BaseIntentionAction {
if (element instanceof PsiField && ((PsiField)element).hasModifierProperty(PsiModifier.STATIC)) {
break;
}
if (element instanceof PsiMethod || (element instanceof PsiClass && !(element instanceof PsiTypeParameter))) {
if (element instanceof PsiClass && ((PsiClass)element).isEnum()) break;
if (element instanceof PsiMethod || isValidClass(element)) {
if (((PsiMember)element).getName() != null) {
parents.add((PsiNameIdentifierOwner)element);
if (findFirstOnly) {
@@ -198,4 +199,8 @@ public class CreateTypeParameterFromUsageFix extends BaseIntentionAction {
}
return parents;
}
private static boolean isValidClass(PsiElement element) {
return element instanceof PsiClass && !(element instanceof PsiTypeParameter);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createTypeParameterFromUsage/beforeEnum.java
+8
View File
@@ -0,0 +1,8 @@
// "Create type parameter 'T'" "false"
public class Test {
private enum State {
VALID, INVALID;
private T<caret> info;
}
}