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

create method from method ref: fis for type element qualifier (IDEA-124485)

Browse Source
This commit is contained in:
Anna Kozlova
2014-04-25 18:35:28 +02:00
parent baccb31d7e
commit a4f2f0e73b
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
View File

@@ -201,7 +201,10 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
return resolvedElement instanceof PsiClass;
} else if (qualifierExpression != null) {
return false;
} else {
} else if (ref instanceof PsiMethodReferenceExpression) {
return true;
}
else {
assert PsiTreeUtil.isAncestor(targetClass, ref, true);
PsiModifierListOwner owner = PsiTreeUtil.getParentOfType(ref, PsiModifierListOwner.class);
if (owner instanceof PsiMethod && ((PsiMethod)owner).isConstructor()) {
@@ -309,7 +312,12 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
}
else if (element instanceof PsiReferenceExpression) {
qualifier = ((PsiReferenceExpression)element).getQualifierExpression();
if (qualifier == null) {
if (qualifier == null && element instanceof PsiMethodReferenceExpression) {
final PsiTypeElement qualifierTypeElement = ((PsiMethodReferenceExpression)element).getQualifierType();
if (qualifierTypeElement != null) {
psiClass = PsiUtil.resolveClassInType(qualifierTypeElement.getType());
}
} else if (qualifier == null) {
final PsiElement parent = element.getParent();
if (parent instanceof PsiSwitchLabelStatement) {
final PsiSwitchStatement switchStatement = PsiTreeUtil.getParentOfType(parent, PsiSwitchStatement.class);

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromMethodRef/afterTypeElementQualifier.java Normal file
View File

@@ -0,0 +1,11 @@
// "Create Method 'fooBar'" "true"
class FooBar {
{
Runnable r = Container<String>::fooBar;
}
}
class Container<T>{
public static void fooBar() {
}
}

7
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromMethodRef/beforeTypeElementQualifier.java Normal file
View File

@@ -0,0 +1,7 @@
// "Create Method 'fooBar'" "true"
class FooBar {
{
Runnable r = Container<String>::foo<caret>Bar;
}
}
class Container<T>{}