From 0d07e20173c43f0b975f8a4008a1034850e05481 Mon Sep 17 00:00:00 2001 From: Andrey Cherkasov Date: Mon, 21 Nov 2022 13:32:03 +0400 Subject: [PATCH] [java-intentions] fixes after review IJ-CR-97477 GitOrigin-RevId: 4670fc763498e8d151f4908e398a181d67d754f0 --- .../src/com/intellij/codeInsight/CodeInsightUtil.java | 2 +- .../daemon/impl/quickfix/CreateInnerClassFromUsageFix.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java index d303dc69458d..73e2100c14d9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java @@ -270,7 +270,7 @@ public final class CodeInsightUtil { return positionCursor(project, targetFile, lBrace != null ? lBrace : psiClass); } - @Nullable("null means unable to open the editor") + @Nullable("no virtual file is associated with a targetFile") public static Editor positionCursor(@NotNull Project project, @NotNull PsiFile targetFile, @NotNull PsiElement element) { TextRange range = element.getTextRange(); LOG.assertTrue(range != null, element.getClass()); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java index ce8c013f7958..1f3aefd8fba9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java @@ -5,7 +5,6 @@ import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; -import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils; import com.intellij.codeInsight.template.TemplateBuilderImpl; import com.intellij.codeInspection.util.IntentionName; import com.intellij.ide.util.PsiClassListCellRenderer; @@ -184,7 +183,7 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix { TemplateBuilderImpl templateBuilder = createRecordHeaderTemplate(aClass, deconstructionList); CreateFromUsageBaseFix.startTemplate(project, aClass, templateBuilder.buildTemplate(), text); } - else if (!IntentionPreviewUtils.isPreviewElement(deconstructionList)) { + else { CodeInsightUtil.positionCursor(project, aClass.getContainingFile(), ObjectUtils.notNull(aClass.getNameIdentifier(), aClass)); } }