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

[java-inspections] CreateInnerClassFromNewFix: preview-friendly

Browse Source 
GitOrigin-RevId: 8961061d0a65a1ce182c79d3d108db30b2e2ee18
This commit is contained in:
Tagir Valeev
2022-07-26 11:14:29 +02:00
committed by intellij-monorepo-bot
parent 8560c6a5d1
commit ed8c359a4c
39 changed files with 75 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
View File

@@ -85,8 +85,8 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
if (aClass.isPhysical()) {
getReferenceElement(newExpression).bindToElement(aClass);
aClass = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(aClass);
}
aClass = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(aClass);
final Template template = templateBuilder.buildTemplate();
template.setToReformat(true);

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

@@ -4,6 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils;
import com.intellij.codeInsight.template.Template;
import com.intellij.codeInsight.template.TemplateEditingListener;
import com.intellij.codeInsight.template.TemplateManager;
@@ -116,6 +117,13 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
TextRange range = element.getTextRange();
LOG.assertTrue(range != null, element.getClass());
int textOffset = range.getStartOffset();
if (IntentionPreviewUtils.isPreviewElement(targetFile)) {
Editor editor = IntentionPreviewUtils.getPreviewEditor();
if (editor != null) {
editor.getCaretModel().moveToOffset(textOffset);
}
return editor;
}
VirtualFile file = targetFile.getVirtualFile();
if (file == null) {
file = PsiUtilCore.getVirtualFile(element);

8
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
View File

@@ -24,6 +24,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorModificationUtil;
import com.intellij.openapi.editor.ScrollType;
@@ -1013,8 +1014,11 @@ public final class CreateFromUsageUtils {
public LookupElement @NotNull [] calculateLookupItems(ExpressionContext context) {
Project project = context.getProject();
int offset = context.getStartOffset();
PsiDocumentManager.getInstance(project).commitAllDocuments();
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument());
Editor editor = context.getEditor();
assert editor != null;
Document document = editor.getDocument();
PsiDocumentManager.getInstance(project).commitDocument(document);
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(document);
assert file != null;
PsiElement elementAt = file.findElementAt(offset);
Set<String> parameterNames = getPeerNames(elementAt);

15
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java
View File

@@ -2,6 +2,7 @@
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -12,6 +13,8 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.JavaPsiConstructorUtil;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class CreateInnerClassFromNewFix extends CreateClassFromNewFix {
private static final Logger LOG = Logger.getInstance(CreateInnerClassFromNewFix.class);
@@ -46,8 +49,20 @@ public class CreateInnerClassFromNewFix extends CreateClassFromNewFix {
chooseTargetClass(project, editor, this::invokeImpl);
}
@Override
public @NotNull IntentionPreviewInfo generatePreview(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
PsiElement element = PsiTreeUtil.findSameElementInCopy(getElement(), file);
List<PsiClass> targetClasses = filterTargetClasses(element, project);
if (targetClasses.isEmpty()) return IntentionPreviewInfo.EMPTY;
invokeImpl(targetClasses.get(0));
return IntentionPreviewInfo.DIFF;
}
private void invokeImpl(final PsiClass targetClass) {
PsiNewExpression newExpression = getNewExpression();
if (!targetClass.isPhysical()) {
newExpression = PsiTreeUtil.findSameElementInCopy(newExpression, targetClass.getContainingFile());
}
PsiJavaCodeReferenceElement ref = newExpression.getClassOrAnonymousClassReference();
assert ref != null;
String refName = ref.getReferenceName();

13
java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java
View File

@@ -9,6 +9,7 @@ import com.intellij.codeInsight.template.PsiTypeResult;
import com.intellij.codeInsight.template.Result;
import com.intellij.codeInsight.template.impl.JavaTemplateUtil;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
@@ -37,7 +38,11 @@ public class TypeExpression extends Expression {
@Override
public Result calculateResult(ExpressionContext context) {
final Project project = context.getProject();
PsiDocumentManager.getInstance(project).commitAllDocuments();
Editor editor = context.getEditor();
if (editor != null) {
Document document = editor.getDocument();
PsiDocumentManager.getInstance(project).commitDocument(document);
}
if (myItems.isEmpty()) return null;
final PsiType type = myItems.iterator().next().getType();
@@ -57,7 +62,11 @@ public class TypeExpression extends Expression {
@Override
public LookupElement[] calculateLookupItems(ExpressionContext context) {
if (myItems.size() <= 1) return null;
PsiDocumentManager.getInstance(context.getProject()).commitAllDocuments();
Editor editor = context.getEditor();
if (editor != null) {
Document document = editor.getDocument();
PsiDocumentManager.getInstance(context.getProject()).commitDocument(document);
}
List<LookupElement> result = new ArrayList<>(myItems.size());
for (final SmartTypePointer item : myItems) {

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

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/after2.java
View File

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/after3.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyInteger'" "true"
// "Create inner class 'MyInteger'" "true-preview"
public class Test {
public static void main() {
int xxx = 3;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/after6.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyCollection'" "true"
// "Create inner class 'MyCollection'" "true-preview"
public class Test {
public static void main() {
Collection[] cc = new MyCollection[10];

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/after8.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyTableModel'" "true"
// "Create inner class 'MyTableModel'" "true-preview"
public class Test {
public static void main() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterAnonymous.java
View File

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterGenerics.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Generic'" "true"
// "Create inner class 'Generic'" "true-preview"
class Test {
void foo () {
new Generic<String> ();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterInInterface.java
View File

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

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

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterInSuperNonConstructor.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Generic'" "true"
// "Create inner class 'Generic'" "true-preview"
class Base {
void foo(){}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterInThis.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Generic'" "true"
// "Create inner class 'Generic'" "true-preview"
class Test {
Test() {
this (new Generic<String> ());

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterQualifiedNew2.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'ArrayList'" "true"
// "Create inner class 'ArrayList'" "true-preview"
public class Test {
public static void main() {
Inner q = new Inner();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterQualifiedNew3.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'ArrayList'" "true"
// "Create inner class 'ArrayList'" "true-preview"
public class Test {
public static void main() {
new B.ArrayList();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterRecord.java
View File

@@ -1,4 +1,4 @@
// "Create inner record 'Foo'" "true"
// "Create inner record 'Foo'" "true-preview"
public class Test {
public static void main() {
new Foo("bar", "baz")

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterRecordInInner.java
View File

@@ -1,4 +1,4 @@
// "Create inner record 'Point'" "true"
// "Create inner record 'Point'" "true-preview"
public class Test {
class Inner {
void test(int x, int y) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterTypeParamSetup.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'AInner'" "true"
// "Create inner class 'AInner'" "true-preview"
class Test {
{
AInner aInner = new AInner<String>(42);

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterTypeParamSetup1.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'AInner'" "true"
// "Create inner class 'AInner'" "true-preview"
class Test {
{
AInner aInner = new AInner<String, String>(42);

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

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/before2.java
View File

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/before3.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyInteger'" "true"
// "Create inner class 'MyInteger'" "true-preview"
public class Test {
public static void main() {
int xxx = 3;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/before6.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyCollection'" "true"
// "Create inner class 'MyCollection'" "true-preview"
public class Test {
public static void main() {
Collection[] cc = new <caret>MyCollection[10];

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/before8.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'MyTableModel'" "true"
// "Create inner class 'MyTableModel'" "true-preview"
public class Test {
public static void main() {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeAnonymous.java
View File

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeGenerics.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Generic'" "true"
// "Create inner class 'Generic'" "true-preview"
class Test {
void foo () {
new <caret>Generic<String> ();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeInInterface.java
View File

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

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

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

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeInSuperNonConstructor.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Generic'" "true"
// "Create inner class 'Generic'" "true-preview"
class Base {
void foo(){}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeInThis.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'Generic'" "true"
// "Create inner class 'Generic'" "true-preview"
class Test {
Test() {
this (new <caret>Generic<String> ());

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeQualifiedNew2.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'ArrayList'" "true"
// "Create inner class 'ArrayList'" "true-preview"
public class Test {
public static void main() {
Inner q = new Inner();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeQualifiedNew3.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'ArrayList'" "true"
// "Create inner class 'ArrayList'" "true-preview"
public class Test {
public static void main() {
new B.<caret>ArrayList();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeRecord.java
View File

@@ -1,4 +1,4 @@
// "Create inner record 'Foo'" "true"
// "Create inner record 'Foo'" "true-preview"
public class Test {
public static void main() {
new F<caret>oo("bar", "baz")

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeRecordInInner.java
View File

@@ -1,4 +1,4 @@
// "Create inner record 'Point'" "true"
// "Create inner record 'Point'" "true-preview"
public class Test {
class Inner {
void test(int x, int y) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeTypeParamSetup.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'AInner'" "true"
// "Create inner class 'AInner'" "true-preview"
class Test {
{
AInner aInner = new AIn<caret>ner<String>(42);

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/beforeTypeParamSetup1.java
View File

@@ -1,4 +1,4 @@
// "Create inner class 'AInner'" "true"
// "Create inner class 'AInner'" "true-preview"
class Test {
{
AInner aInner = new AIn<caret>ner<String, String>(42);