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

[java-inspections] CreateInnerClassFromUsageFix: preview-friendly

Browse Source 
GitOrigin-RevId: ed0dbc12d26e87c17315f369da687dd4fe65d63d
This commit is contained in:
Tagir Valeev
2022-07-26 11:22:08 +02:00
committed by intellij-monorepo-bot
parent ed8c359a4c
commit d3341c8cc9
31 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java
View File

@@ -17,6 +17,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Editor;
@@ -71,6 +72,17 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix {
}
}
@Override
public @NotNull IntentionPreviewInfo generatePreview(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
PsiJavaCodeReferenceElement element = getRefElement();
if (element == null) return IntentionPreviewInfo.EMPTY;
element = PsiTreeUtil.findSameElementInCopy(element, file);
PsiClass[] targets = getPossibleTargets(element);
if (targets.length == 0) return IntentionPreviewInfo.EMPTY;
doInvoke(targets[0], getSuperClassName(element));
return IntentionPreviewInfo.DIFF;
}
@Override
public boolean isAvailable(@NotNull final Project project, final Editor editor, final PsiFile file) {
return super.isAvailable(project, editor, file) && getPossibleTargets(getRefElement()).length > 0;
@@ -117,9 +129,13 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix {
}
private void doInvoke(final PsiClass aClass, final String superClassName) throws IncorrectOperationException {
PsiJavaCodeReferenceElement ref = getRefElement();
PsiJavaCodeReferenceElement ref;
if (!aClass.isPhysical()) {
ref = PsiTreeUtil.findSameElementInCopy(getRefElement(), aClass.getContainingFile());
} else {
ref = getRefElement();
}
assert ref != null;
if (!FileModificationService.getInstance().preparePsiElementForWrite(aClass)) return;
String refName = ref.getReferenceName();
LOG.assertTrue(refName != null);
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(aClass.getProject());
@@ -139,8 +155,13 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix {
}
CreateFromUsageBaseFix.setupGenericParameters(created, ref);
WriteCommandAction.runWriteCommandAction(aClass.getProject(), getText(), null,
() -> ref.bindToElement(aClass.add(created)),
aClass.getContainingFile());
if (!aClass.isPhysical()) {
aClass.add(created);
} else {
if (!FileModificationService.getInstance().preparePsiElementForWrite(aClass)) return;
WriteCommandAction.runWriteCommandAction(aClass.getProject(), getText(), null,
() -> ref.bindToElement(aClass.add(created)),
aClass.getContainingFile());
}
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/after1.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
public foo(int ppp) {
<caret>Abc.foo();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterCast.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'ClassB'" "true"
// "Create inner class 'ClassB'" "true-preview"
public class ClassA
{
public void mA(Object arg)

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterClassObjectAccess1.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterClassObjectAccess2.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<? extends Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterClassObjectAccess3.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<? super Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterClassObjectAccess4.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<? extends Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterFieldType.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
private <caret>Abc fld;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterInLocal.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Param'" "true"
// "Create inner class 'Param'" "true-preview"
import java.util.*;
public interface I {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterInnerInInterface.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public interface Test {
void foo(Fo<caret>o f){}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterInstanceof.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
boolean foo(Object o) {
return o instanceof Foo;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterMethodType.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
private <caret>Abc foo() {}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterParameterType.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
private void foo(<caret>Abc param) {}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterStaticModifierNeeded.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
static class A extends Foo {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterSuperInterface.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyRunnable'" "true"
// "Create inner class 'MyRunnable'" "true-preview"
public class Test {
void bar(Class<? extends Runnable> c) {
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/afterTypeParameterCreated.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
<R> void foo(Fo<caret>o<R, String> f){}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/before1.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
public foo(int ppp) {
<caret>Abc.foo();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeCast.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'ClassB'" "true"
// "Create inner class 'ClassB'" "true-preview"
public class ClassA
{
public void mA(Object arg)

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeClassObjectAccess1.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeClassObjectAccess2.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<? extends Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeClassObjectAccess3.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<? super Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeClassObjectAccess4.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
void foo(Class<? extends Number> n){}
void bar() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeFieldType.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
private <caret>Abc fld;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeInLocal.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Param'" "true"
// "Create inner class 'Param'" "true-preview"
import java.util.*;
public interface I {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeInnerInInterface.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public interface Test {
void foo(Fo<caret>o f){}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeInstanceof.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
boolean foo(Object o) {
return o instanceof F<caret>oo;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeMethodType.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
private <caret>Abc foo() {}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeParameterType.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Abc'" "true"
// "Create inner class 'Abc'" "true-preview"
public class Test {
private void foo(<caret>Abc param) {}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeStaticModifierNeeded.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
static class A extends F<caret>oo {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeSuperInterface.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyRunnable'" "true"
// "Create inner class 'MyRunnable'" "true-preview"
public class Test {
void bar(Class<? extends Runnable> c) {
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromUsage/beforeTypeParameterCreated.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Foo'" "true"
// "Create inner class 'Foo'" "true-preview"
public class Test {
<R> void foo(Fo<caret>o<R, String> f){}
}