MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-intentions] Remove outdated MoveMemberIntoClassFix.java

Browse Source 
Superseded by MoveMemberIntoClassFix.java

GitOrigin-RevId: cc3a29aa7089f91ff5c13a61e722c0ad3843985e
This commit is contained in:
Tagir Valeev
2024-04-22 13:44:41 +02:00
committed by intellij-monorepo-bot
parent 0d7b245b21
commit 11097530d4
4 changed files with 0 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
View File

@@ -522,13 +522,6 @@ public abstract class QuickFixFactory {
public abstract @NotNull IntentionAction createRemoveDuplicateExtendsAction(@NotNull String className);
/**
* @deprecated error elements are not provided anymore for members declared out of class.
* Now they are members of an implicitly declared class and can be moved as usual members.
*/
@Deprecated
public abstract @NotNull IntentionAction createMoveMemberIntoClassFix(@NotNull PsiErrorElement errorElement);
/**
* Creates a fix that changes the type of the receiver parameter
*

103
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveMemberIntoClassFix.java
View File

@@ -1,103 +0,0 @@
// Copyright 2000-2024 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.daemon.impl.analysis.MemberModel;
import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.java.JavaBundle;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.modcommand.ActionContext;
import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.modcommand.PsiUpdateModCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
public class MoveMemberIntoClassFix extends PsiUpdateModCommandAction<PsiErrorElement> {
public MoveMemberIntoClassFix(@NotNull PsiErrorElement errorElement) {
super(errorElement);
}
@Override
protected void invoke(@NotNull ActionContext context, @NotNull PsiErrorElement element, @NotNull ModPsiUpdater updater) {
PsiFile file = element.getContainingFile();
MemberInfo rangeAndMember = createMember(file, element);
if (rangeAndMember == null) return;
Document document = file.getViewProvider().getDocument();
TextRange memberRange = rangeAndMember.range();
PsiMember member = rangeAndMember.member();
PsiClass psiClass = getPsiClass(file, member);
if (psiClass == null) return;
if (psiClass.getContainingFile() != file) {
psiClass = (PsiClass)file.add(psiClass);
}
PsiDocumentManager documentManager = PsiDocumentManager.getInstance(context.project());
documentManager.doPostponedOperationsAndUnblockDocument(document);
SmartPsiElementPointer<PsiClass> classPtr = SmartPointerManager.createPointer(psiClass);
document.deleteString(memberRange.getStartOffset(), memberRange.getEndOffset());
documentManager.commitDocument(document);
psiClass = classPtr.getElement();
if (psiClass == null) return;
PsiElement rBrace = psiClass.getRBrace();
if (rBrace == null) return;
psiClass.addBefore(member, rBrace);
}
private static @Nullable PsiClass getPsiClass(@NotNull PsiFile file, @NotNull PsiMember member) {
String className = FileUtilRt.getNameWithoutExtension(file.getName());
if (!StringUtil.isJavaIdentifier(className)) return null;
PsiJavaFile javaFile = ObjectUtils.tryCast(file, PsiJavaFile.class);
if (javaFile == null) return null;
PsiClass psiClass = ContainerUtil.find(javaFile.getClasses(), c -> className.equals(c.getName()));
if (psiClass != null) return psiClass;
PsiElementFactory factory = JavaPsiFacade.getElementFactory(file.getProject());
return createClass(factory, className, member);
}
@Override
public @NotNull String getFamilyName() {
return JavaBundle.message("intention.family.name.move.member.into.class");
}
private static @NotNull PsiClass createClass(@NotNull PsiElementFactory factory, @NotNull String className, @NotNull PsiMember member) {
PsiMethod psiMethod = ObjectUtils.tryCast(member, PsiMethod.class);
if (psiMethod == null || psiMethod.getBody() != null || psiMethod.hasModifier(JvmModifier.NATIVE)) {
return factory.createClass(className);
}
if (psiMethod.hasModifier(JvmModifier.ABSTRACT)) {
PsiClass psiClass = factory.createClass(className);
Objects.requireNonNull(psiClass.getModifierList()).setModifierProperty(PsiModifier.ABSTRACT, true);
return psiClass;
}
return factory.createInterface(className);
}
record MemberInfo(@NotNull TextRange range, @NotNull PsiMember member) {}
private static @Nullable MemberInfo createMember(@NotNull PsiFile file, @NotNull PsiErrorElement errorElement) {
MemberModel model = MemberModel.create(errorElement);
if (model == null) return null;
TextRange memberRange = model.textRange();
String memberText = memberRange.substring(file.getText());
PsiElementFactory factory = JavaPsiFacade.getElementFactory(file.getProject());
MemberModel.MemberType memberType = model.memberType();
return new MemberInfo(memberRange, memberType.create(factory, memberText, file));
}
@Override
protected @NotNull IntentionPreviewInfo generatePreview(ActionContext context, PsiErrorElement element) {
MemberInfo info = createMember(context.file(), element);
if (info == null || !(info.member() instanceof PsiNamedElement member)) return IntentionPreviewInfo.EMPTY;
PsiClass psiClass = getPsiClass(context.file(), info.member());
if (psiClass == null) return IntentionPreviewInfo.EMPTY;
return IntentionPreviewInfo.movePsi(member, psiClass);
}
}

5
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
View File

@@ -959,11 +959,6 @@ public final class QuickFixFactoryImpl extends QuickFixFactory {
return new UnimplementInterfaceAction.RemoveDuplicateExtendFix(className).asIntention();
}
@Override
public @NotNull IntentionAction createMoveMemberIntoClassFix(@NotNull PsiErrorElement errorElement) {
return new MoveMemberIntoClassFix(errorElement).asIntention();
}
@Override
public @NotNull IntentionAction createReceiverParameterTypeFix(@NotNull PsiReceiverParameter parameter, @NotNull PsiType newType) {
return new ReceiverParameterTypeFix(parameter, newType).asIntention();

1
java/openapi/resources/messages/JavaBundle.properties
View File

@@ -1449,7 +1449,6 @@ intention.error.make.sealed.class.different.packages=Module is unnamed and some
intention.error.make.sealed.class.inheritors.not.in.java.file=Some of the inheritors are not in java files
intention.error.make.sealed.class.different.modules=Some of the inheritors are in different modules
intention.error.make.sealed.class.interface.has.no.inheritors=Interface has no inheritors
intention.family.name.move.member.into.class=Move member into class
inspection.fill.permits.list.no.missing.inheritors=Sealed class has no missing inheritors
inspection.fill.permits.list.display.name=Same file subclasses are missing from permits clause of a sealed class
inspection.fill.permits.list.fix.name=Add missing subclasses to the permits clause