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

[intentions preview] more lines in preview for Create class from new (^Tagir)

Browse Source 
IJ-CR-27381

GitOrigin-RevId: 1ac3b8f0f4d6958306d059ddda43aff5e7485c6d
This commit is contained in:
Anna Kozlova
2022-07-20 13:48:57 +00:00
committed by intellij-monorepo-bot
parent ea586482fd
commit 3e2a443d2d
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
+10 -14
View File
@@ -12,13 +12,13 @@ import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.ide.scratch.ScratchUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Segment;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilCore;
@@ -57,14 +57,10 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
if (element == null) return IntentionPreviewInfo.EMPTY;
PsiJavaCodeReferenceElement classReference = getReferenceElement(element);
if (classReference == null) return IntentionPreviewInfo.EMPTY;
String text;
if (getKind() == CreateClassKind.RECORD) {
text = "record" + " " + classReference.getReferenceName() + "()";
}
else {
text = "class" + " " + classReference.getReferenceName();
}
return new IntentionPreviewInfo.CustomDiff(JavaFileType.INSTANCE, "", text + " {}");
PsiClass aClass = getKind().create(JavaPsiFacade.getElementFactory(project), classReference.getReferenceName());
setupClassFromNewExpression(aClass, element);
CodeStyleManager.getInstance(project).reformat(aClass);
return new IntentionPreviewInfo.CustomDiff(JavaFileType.INSTANCE, "", aClass.getText());
}
@NotNull
@@ -73,13 +69,11 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
}
protected void setupClassFromNewExpression(final PsiClass psiClass, final PsiNewExpression newExpression) {
assert ApplicationManager.getApplication().isWriteAccessAllowed();
PsiClass aClass = psiClass;
if (aClass == null) return;
final PsiJavaCodeReferenceElement classReference = newExpression.getClassReference();
if (classReference != null) {
if (classReference != null && aClass.isPhysical()) {
classReference.bindToElement(aClass);
}
setupInheritance(newExpression, aClass);
@@ -89,8 +83,10 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
if (argList != null && !argList.isEmpty()) {
TemplateBuilderImpl templateBuilder = createConstructorTemplate(aClass, newExpression, argList);
getReferenceElement(newExpression).bindToElement(aClass);
aClass = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(aClass);
if (aClass.isPhysical()) {
getReferenceElement(newExpression).bindToElement(aClass);
aClass = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(aClass);
}
final Template template = templateBuilder.buildTemplate();
template.setToReformat(true);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
+4 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.ExpectedTypeInfo;
@@ -53,7 +53,9 @@ public class GuessTypeParameters {
@Nullable PsiElement context,
@NotNull PsiClass targetClass) {
LOG.assertTrue(typeElement.isValid());
ApplicationManager.getApplication().assertWriteAccessAllowed();
if (typeElement.isPhysical()) {
ApplicationManager.getApplication().assertWriteAccessAllowed();
}
GlobalSearchScope scope = typeElement.getResolveScope();