MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 13:20:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

create enum: add implements list if needed (IDEA-93141)

Browse Source
This commit is contained in:
anna
2013-01-04 16:00:24 +01:00
parent 22ca4efb4f
commit a7fb7f9f54
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java
View File

@@ -134,12 +134,13 @@ public abstract class CreateClassFromUsageBaseFix extends BaseIntentionAction {
}
@Nullable
protected static String getSuperClassName(final PsiJavaCodeReferenceElement element) {
protected String getSuperClassName(final PsiJavaCodeReferenceElement element) {
String superClassName = null;
final PsiElement ggParent = element.getParent().getParent();
PsiElement parent = element.getParent();
final PsiElement ggParent = parent.getParent();
if (ggParent instanceof PsiMethod) {
PsiMethod method = (PsiMethod)ggParent;
if (method.getThrowsList() == element.getParent()) {
if (method.getThrowsList() == parent) {
superClassName = "java.lang.Exception";
}
} else if (ggParent instanceof PsiClassObjectAccessExpression) {
@@ -156,6 +157,16 @@ public abstract class CreateClassFromUsageBaseFix extends BaseIntentionAction {
if (aClass != null) return aClass.getQualifiedName();
}
}
} else if (ggParent instanceof PsiExpressionList && parent instanceof PsiExpression && myKind == CreateClassKind.ENUM) {
final ExpectedTypeInfo[] expectedTypes = ExpectedTypesProvider.getExpectedTypes((PsiExpression)parent, false);
if (expectedTypes.length == 1) {
final PsiClassType.ClassResolveResult classResolveResult = PsiUtil.resolveGenericsClassInType(expectedTypes[0].getType());
final PsiClass psiClass = classResolveResult.getElement();
if (psiClass != null && psiClass.isInterface()) {
return psiClass.getQualifiedName();
}
}
return null;
}
return superClassName;

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createClassFromUsage/afterEnumUsedInCall.java Normal file
View File

@@ -0,0 +1,11 @@
// "Create Enum 'Foo'" "true"
public class Test {
void f(I i) {}
{
f(Foo.CONST);
}
}
interface I {}
public enum Foo implements I {}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createClassFromUsage/beforeEnumUsedInCall.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create Enum 'Foo'" "true"
public class Test {
void f(I i) {}
{
f(Fo<caret>o.CONST);
}
}
interface I {}